openshift-origin-node 1.3.1

data/misc/bin/setup_pam_fs_limits.sh

@@ -0,0 +1,146 @@
+#!/bin/bash
+#
+# Sets up the PAM filesystem and quota limits for an OpenShift gear
+#
+
+
+#
+# Add a PAM limit set to the user
+#
+# IN: username
+# IN: limits_order
+# IN: limits_nproc
+#
+
+LIMITSVARS="core data fsize memlock nofile rss stack cpu nproc as maxlogins priority locks sigpending msgqueue nice rprio"
+
+function set_pam_limits {
+    USERNAME=$1
+    #assume these come from sourced config file into environment
+    #LIMITS_ORDER=${2:-$limits_order}
+    #LIMITS_NPROC=${3:-$limits_nproc}
+
+    LIMITSFILE=/etc/security/limits.d/${limits_order}-${USERNAME}.conf
+
+    if [ -z "${NOOP}" ]
+    then
+	cat <<EOF > ${LIMITSFILE}
+# PAM process limits for guest $USERNAME
+# see limits.conf(5) for details
+#Each line describes a limit for a user in the form:
+#
+#<domain> <type> <item> <value>
+EOF
+    else
+	echo "cat <<EOF > ${LIMITSFILE}
+# PAM process limits for guest $USERNAME
+# see limits.conf(5) for details
+#Each line describes a limit for a user in the form:
+#
+#<domain>        <type>  <item>  <value>
+${USERNAME}     hard    nproc   ${LIMITS_NPROC}
+EOF"
+
+    fi
+
+    for KEY in $LIMITSVARS
+    do
+	VALUE=`eval echo \\$limits_$KEY`
+	if [ -n "$VALUE" ]
+	then
+	    if [ -z "${NOOP}" ]
+        then
+		    echo "${USERNAME} hard $KEY $VALUE" >> ${LIMITSFILE}
+        else
+		    echo "echo \"${USERNAME} hard $KEY $VALUE\" >> ${LIMITSFILE}"
+	    fi
+	fi
+    done
+
+}
+
+
+#
+# Return the mount point of the file system for a given path
+#
+function get_mountpoint() {
+    df -P $1 2>/dev/null | tail -1 | awk '{ print $6 }'
+}
+
+# Are quotas enabled on the specified directory?
+function quotas_enabled {
+    # DIR=$1
+    QUOTA_ROOT=`get_mountpoint $1`
+    # if you can't find the quota root for the given directory, it's not enabled
+    if [ -z "${QUOTA_ROOT}" ]
+    then
+        return 1
+    fi
+    quotaon -u -p $QUOTA_ROOT >/dev/null 2>&1
+    # quotaon returns the opposite of what you expect
+    # 1 = enabled, 0 = not enabled
+    if [ $? -eq 0 ]
+    then
+        return 1
+    else
+        return 0
+    fi
+}
+
+#
+# Set a user's inode and block quotas on the home file system
+# usage: set_fs_quota <username> <inodes> <blocks>
+function set_fs_quotas {
+    # USERNAME=$1
+    # QUOTA_BLOCKS=${2:-$quota_blocks}
+    # QUOTA_FILES=${3:-$quota_files}
+
+    # get the user home directory
+    # get the quota mount point
+    if quotas_enabled $GEAR_BASE_DIR
+    then
+        setquota $1 0 $2 0 $3 `get_mountpoint $GEAR_BASE_DIR`
+    else
+        echo "WARNING: quotas not enabled on $GEAR_BASE_DIR" >&2
+    fi
+}
+
+# ============================================================================
+#                                 MAIN
+# ============================================================================
+
+# Load defaults and node configuration
+source /etc/openshift/node.conf
+
+
+# defaults
+limits_order=84
+limits_nproc=100
+quota_files=1000
+# a block = 1Kbytes: 1k * 1024 * 128
+quota_blocks=`expr 1024 \* 128` # 128MB
+
+# Load system configuration
+source /etc/openshift/resource_limits.conf
+
+
+# Allow the command line to override quota and limits
+username=$1
+quota_blocks_custom=$2
+quota_files_custom=$3
+nproc_custom=$4
+
+if [ -n "$quota_blocks_custom" ] && [ $quota_blocks_custom -gt $quota_blocks ]
+then
+    quota_blocks=$quota_blocks_custom
+fi
+if [ -n "$quota_files_custom" ] && [ $quota_files_custom -gt $quota_files ]
+then
+    quota_files=$quota_files_custom
+fi
+if [ -n "$nproc_custom" ] && [ $nproc_custom -le $limits_nproc ]
+then
+    limits_nproc=$nproc_custom
+fi
+set_pam_limits $username
+set_fs_quotas $username $quota_blocks $quota_files

data/misc/bin/teardown_pam_fs_limits.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Tear down the PAM filesystem and quota limits for an OpenShift gear
+#
+
+#
+# Add a PAM limit set to the user
+#
+# IN: username
+# IN: limits_order
+#
+
+function remove_pam_limits {
+    USERNAME=$1
+    LIMITS_ORDER=${2:-$limits_order}
+
+    LIMITSFILE=/etc/security/limits.d/${LIMITS_ORDER}-${USERNAME}.conf
+
+    ${NOOP} rm -f ${LIMITSFILE}
+}
+
+
+function get_mountpoint() {
+    df -P $1 2>/dev/null | tail -1 | awk '{ print $6 }'
+}
+
+# Are quotas enabled on the specified directory?
+function quotas_enabled {
+    # DIR=$1
+    QUOTA_ROOT=`get_mountpoint $1`
+    # if you can't find the quota root for the given directory, it's not enabled
+    if [ -z "${QUOTA_ROOT}" ]
+    then
+        return 1
+    fi
+    quotaon -u -p $QUOTA_ROOT >/dev/null 2>&1
+    # quotaon returns the opposite of what you expect
+    # 1 = enabled, 0 = not enabled
+    if [ $? -eq 0 ]
+    then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# Remove filesystem quota limits for the user
+function remove_fs_quotas {
+    USERNAME=$1
+    if quotas_enabled $GEAR_BASE_DIR
+    then
+        setquota $1 0 0 0 0 `get_mountpoint $GEAR_BASE_DIR`
+    else
+        echo "WARNING: quotas not enabled on $GEAR_BASE_DIR" >&2
+    fi
+}
+
+# ============================================================================
+#                                 MAIN
+# ============================================================================
+
+# Load defaults and node configuration
+source /etc/openshift/node.conf
+
+# defaults
+limits_order=84
+
+# Load system configuration
+source /etc/openshift/resource_limits.conf
+
+username=$1
+remove_fs_quotas $username
+remove_pam_limits $username

data/misc/doc/cgconfig.conf

@@ -0,0 +1,26 @@
+#
+#  Copyright IBM Corporation. 2007
+#
+#  Authors: Balbir Singh <balbir@linux.vnet.ibm.com>
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of version 2.1 of the GNU Lesser General Public License
+#  as published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it would be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# See man cgconfig.conf for further details.
+#
+# By default, mount all controllers to /cgroup/<controller>
+
+mount {
+	cpuset	= /cgroup/cpuset;
+	cpu	= /cgroup/all;
+	cpuacct	= /cgroup/all;
+	memory	= /cgroup/all;
+	devices	= /cgroup/devices;
+	freezer	= /cgroup/all;
+	net_cls	= /cgroup/all;
+	blkio	= /cgroup/blkio;
+}

data/misc/etc/openshift-run.conf

@@ -0,0 +1 @@
+d /var/run/openshift 0775 root root -

data/misc/init/openshift-cgroups

@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# openshift-cgroups This shell script initializes openshift control groups
+#
+# Author:       Seth Vidal <skvidal@phy.duke.edu>
+#               Mike McGrath <mmcgrath@redhat.com>
+#               Mark lamourine <markllama@redhat.com>
+#
+# chkconfig:    345 16 84
+#
+# Required-Start: cgconfig cgred
+#
+# description:  Create Openshift user cgroups
+# processname:  NA
+#
+
+# CAVEAT: if the policy is changed, must run these by hand (release ticket)
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+case "$1" in
+  start)
+    /usr/bin/oo-admin-ctl-cgroups startall
+    ;;
+
+  stop) 
+    /usr/bin/oo-admin-ctl-cgroups stopall
+    ;;
+
+  restart|force-reload|reload)
+    /usr/bin/oo-admin-ctl-cgroups restartall
+    ;;
+
+  condrestart)
+    /usr/bin/oo-admin-ctl-cgroups condrestartall
+    ;;
+
+  status)
+    /usr/bin/oo-admin-ctl-cgroups status $2
+    ;;
+
+  startuser)
+	/usr/bin/oo-admin-ctl-cgroups startuser $2
+    ;;
+
+  stopuser)
+	/usr/bin/oo-admin-ctl-cgroups stopuser $2
+    ;;
+
+  *)
+    echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|startuser <username>|stopuser <username>}"
+    exit 1
+esac
+
+exit $RETVAL

data/misc/services/openshift-cgroups.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=OpenShift CGroups
+After=runlevel3.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/oo-admin-ctl-cgroups startall
+ExecStop=/usr/bin/oo-admin-ctl-cgroups stopall
+ExecReload=/usr/bin/oo-admin-ctl-cgroups restartall
+Restart=no
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

data/openshift-origin-node.gemspec

@@ -0,0 +1,31 @@
+# OS independent path locations
+bin_dir  = File.join("bin", "*")
+conf_dir = File.join("conf", "*")
+lib_dir  = File.join(File.join("lib", "**"), "*")
+misc_dir  = File.join(File.join("misc", "**"), "*")
+test_dir  = File.join(File.join("test", "**"), "*")
+spec_file = "rubygem-openshift-origin-node.spec"
+
+Gem::Specification.new do |s|
+  s.name        = "openshift-origin-node"
+  s.version     = `rpm -q --define 'rhel 7' --qf "%{version}\n" --specfile #{spec_file}`.split[0]
+  s.license     = `rpm -q --define 'rhel 7' --qf "%{license}\n" --specfile #{spec_file}`.split[0]
+  s.authors     = ["Krishna Raman"]
+  s.email       = ["kraman@gmail.com"]
+  s.homepage    = `rpm -q --define 'rhel 7' --qf "%{url}\n" --specfile #{spec_file}`.split[0]
+  s.summary     = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+  s.description = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+
+  s.rubyforge_project = "openshift-origin-node"
+  s.files       = Dir[lib_dir] + Dir[bin_dir] + Dir[conf_dir] + Dir[test_dir] + Dir[misc_dir]
+  s.files       += %w(README.md Rakefile Gemfile rubygem-openshift-origin-node.spec openshift-origin-node.gemspec COPYRIGHT LICENSE)
+  s.executables = Dir[bin_dir].map {|binary| File.basename(binary)}
+  s.require_paths = ["lib"]
+  s.add_dependency("json")
+  s.add_dependency("parseconfig", ">= 0.5.2")
+  s.add_dependency("openshift-origin-common")
+
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('mocha', "0.9.8")
+  s.add_development_dependency('rake', '>= 0.8.7', '<= 0.9.2.2')
+end

data/rubygem-openshift-origin-node.spec

@@ -0,0 +1,263 @@
+%if 0%{?fedora}%{?rhel} <= 6
+    %global scl ruby193
+    %global scl_prefix ruby193-
+%endif
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package rubygem-%{gem_name}}
+%global gem_name openshift-origin-node
+%global rubyabi 1.9.1
+
+%global appdir %{_var}/lib/openshift
+%define apprundir %{_var}/run/openshift
+
+Summary:        Cloud Development Node
+Name:           rubygem-%{gem_name}
+Version: 1.3.1
+Release:        1%{?dist}
+Group:          Development/Languages
+License:        ASL 2.0
+URL:            http://openshift.redhat.com
+Source0:        rubygem-%{gem_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+Requires:       %{?scl:%scl_prefix}ruby
+Requires:       %{?scl:%scl_prefix}rubygems
+Requires:       %{?scl:%scl_prefix}rubygem(json)
+Requires:       %{?scl:%scl_prefix}rubygem(parseconfig)
+Requires:       %{?scl:%scl_prefix}rubygem(mocha)
+Requires:       %{?scl:%scl_prefix}rubygem(rspec)
+Requires:       rubygem(openshift-origin-common)
+Requires:       python
+Requires:       libselinux-python
+Requires:       mercurial
+
+%if 0%{?fedora}%{?rhel} <= 6
+Requires:       libcgroup
+%else
+Requires:       libcgroup-tools
+%endif
+Requires:       pam_openshift
+Requires:       quota
+
+%if 0%{?fedora}%{?rhel} <= 6
+BuildRequires:  ruby193-build
+BuildRequires:  scl-utils-build
+%endif
+BuildRequires:  %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+BuildRequires:  %{?scl:%scl_prefix}ruby 
+BuildRequires:  %{?scl:%scl_prefix}rubygems
+BuildRequires:  %{?scl:%scl_prefix}rubygems-devel
+BuildArch:      noarch
+Provides:       rubygem(%{gem_name}) = %version
+Obsoletes: 	    rubygem-stickshift-node
+
+%description
+This contains the Cloud Development Node packaged as a rubygem.
+
+%prep
+%setup -q
+
+%build
+%{?scl:scl enable %scl - << \EOF}
+mkdir -p .%{gem_dir}
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+# gem install compiles any C extensions and installs into a directory
+# We set that to be a local directory so that we can move it into the
+# buildroot in %%install
+gem install -V \
+        --local \
+        --install-dir .%{gem_dir} \
+        --bindir ./%{_bindir} \
+        --force \
+        --rdoc \
+        %{gem_name}-%{version}.gem
+%{?scl:EOF}
+
+%install
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
+
+# Move the gem binaries to the standard filesystem location
+mkdir -p %{buildroot}/usr/bin
+cp -a ./%{_bindir}/* %{buildroot}/usr/bin
+
+mkdir -p %{buildroot}/etc/httpd/conf.d
+mkdir -p %{buildroot}%{appdir}/.httpd.d
+ln -sf %{appdir}/.httpd.d %{buildroot}/etc/httpd/conf.d/openshift
+
+# Move the gem configs to the standard filesystem location
+mkdir -p %{buildroot}/etc/openshift
+mv %{buildroot}%{gem_instdir}/conf/* %{buildroot}/etc/openshift
+
+#move pam limit binaries to proper location
+mkdir -p %{buildroot}/usr/libexec/openshift/lib
+mv %{buildroot}%{gem_instdir}/misc/bin/teardown_pam_fs_limits.sh %{buildroot}/usr/libexec/openshift/lib
+mv %{buildroot}%{gem_instdir}/misc/bin/setup_pam_fs_limits.sh %{buildroot}/usr/libexec/openshift/lib
+
+#move the shell binaries into proper location
+mv %{buildroot}%{gem_instdir}/misc/bin/* %{buildroot}/usr/bin/
+
+# Create run dir for openshift "services"
+%if 0%{?fedora} >= 15
+mkdir -p %{buildroot}/etc/tmpfiles.d
+mv %{buildroot}%{gem_instdir}/misc/etc/openshift-run.conf %{buildroot}/etc/tmpfiles.d
+%else
+mkdir -p %{buildroot}%{apprundir}
+%endif
+
+# place an example file
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+mv %{buildroot}%{gem_instdir}/misc/doc/cgconfig.conf %{buildroot}%{_docdir}/%{name}-%{version}/cgconfig.conf
+
+%if 0%{?fedora} >= 18
+  #patch for apache 2.4
+  sed -i 's/include/IncludeOptional/g' httpd/000001_openshift_origin_node.conf
+%endif
+mv httpd/000001_openshift_origin_node.conf %{buildroot}/etc/httpd/conf.d/
+
+#%if 0%{?fedora}%{?rhel} <= 6
+mkdir -p %{buildroot}/etc/rc.d/init.d/
+cp %{buildroot}%{gem_instdir}/misc/init/openshift-cgroups %{buildroot}/etc/rc.d/init.d/
+#%else
+#mkdir -p %{buildroot}/etc/systemd/system
+#mv %{buildroot}%{gem_instdir}/misc/services/openshift-cgroups.service %{buildroot}/etc/systemd/system/openshift-cgroups.service
+#%endif
+
+# Don't install or package what's left in the misc directory
+rm -rf %{buildroot}%{gem_instdir}/misc
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE COPYRIGHT
+%doc %{gem_docdir}
+%{gem_instdir}
+%{gem_cache}
+%{gem_spec}
+/usr/bin/*
+/usr/libexec/openshift/lib/setup_pam_fs_limits.sh
+/usr/libexec/openshift/lib/teardown_pam_fs_limits.sh
+%config(noreplace) /etc/openshift
+%config(noreplace) /etc/openshift/node.conf
+%attr(0750,-,-) /etc/httpd/conf.d/openshift
+
+%config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node.conf
+%attr(0755,-,-) %{appdir}
+
+#%if 0%{?fedora}%{?rhel} <= 6
+%attr(0755,-,-)	/etc/rc.d/init.d/openshift-cgroups
+#%else
+#%attr(0750,-,-) /etc/systemd/system
+#%endif
+
+%if 0%{?fedora} >= 15
+/etc/tmpfiles.d/openshift-run.conf
+%else
+# upstart files
+%attr(0755,-,-) %{_var}/run/openshift
+%endif
+
+%post
+echo "/usr/bin/oo-trap-user" >> /etc/shells
+
+# copying this file in the post hook so that this file can be replaced by rhc-node
+# copy this file only if it doesn't already exist
+if ! [ -f /etc/openshift/resource_limits.conf ]; then
+  cp -f /etc/openshift/resource_limits.template /etc/openshift/resource_limits.conf
+fi
+
+%changelog
+* Wed Dec 12 2012 Adam Miller <admiller@redhat.com> 1.3.1-1
+- bump_minor_versions for sprint 22 (admiller@redhat.com)
+
+* Mon Dec 10 2012 Adam Miller <admiller@redhat.com> 1.2.6-1
+- Merge pull request #1007 from sosiouxme/US3036-origin
+  (openshift+bot@redhat.com)
+- Adding oo-accept-systems script for verifying all node hosts from the broker.
+  - also verifies cartridge consistency and checks for stale cartridge cache.
+  oo-accept-node sanity checks public_ip and public_hostname. Minor edits to
+  make node.conf easier to understand. (lmeyer@redhat.com)
+- Fix tests.  The file mock was not working. (rmillner@redhat.com)
+- Post rebase code cleanup. (rmillner@redhat.com)
+- Proper host name validation. (rmillner@redhat.com)
+
+* Thu Dec 06 2012 Adam Miller <admiller@redhat.com> 1.2.5-1
+- bug 884409 (dmcphers@redhat.com)
+- Merge pull request #1023 from ramr/dev/websockets (openshift+bot@redhat.com)
+- Fix frontend httpd tests. (ramr@redhat.com)
+- Node web sockets and http(s) proxy support with spec file and package.
+  (ramr@redhat.com)
+
+* Wed Dec 05 2012 Adam Miller <admiller@redhat.com> 1.2.4-1
+- Fix for Bug 883605 (jhonce@redhat.com)
+- updated gemspecs so they work with scl rpm spec files. (tdawson@redhat.com)
+
+* Tue Dec 04 2012 Adam Miller <admiller@redhat.com> 1.2.3-1
+- Merge pull request #1005 from ironcladlou/US2770 (openshift+bot@redhat.com)
+- Refactor tidy into the node library (ironcladlou@gmail.com)
+- Bug Fixes. (rmillner@redhat.com)
+- Move add/remove alias to the node API. (rmillner@redhat.com)
+
+* Thu Nov 29 2012 Adam Miller <admiller@redhat.com> 1.2.2-1
+- Move force-stop into the the node library (ironcladlou@gmail.com)
+- exit code and usage cleanup (dmcphers@redhat.com)
+- Merge pull request #962 from danmcp/master (openshift+bot@redhat.com)
+- Merge pull request #905 from kraman/ruby19 (openshift+bot@redhat.com)
+- add oo-ruby (dmcphers@redhat.com)
+- F18 compatibility fixes   - apache 2.4   - mongo journaling   - JDK 7   -
+  parseconfig gem update Bugfix for Bind DNS plugin (kraman@gmail.com)
+
+* Sat Nov 17 2012 Adam Miller <admiller@redhat.com> 1.2.1-1
+- bump_minor_versions for sprint 21 (admiller@redhat.com)
+
+* Thu Nov 15 2012 Adam Miller <admiller@redhat.com> 1.1.7-1
+- BZ877125 - File attributes on open shift-cgroups init script are incorrect,
+  should be -rwxr-x--- (calfonso@redhat.com)
+- more ruby1.9 changes (dmcphers@redhat.com)
+
+* Wed Nov 14 2012 Adam Miller <admiller@redhat.com> 1.1.6-1
+- Ruby 1.9 compatibility fixes (ironcladlou@gmail.com)
+- getting specs up to 1.9 sclized (dmcphers@redhat.com)
+- Merge pull request #886 from rmillner/inhibitidler (dmcphers@redhat.com)
+- One of the SELinux denials was accessing the locale file via whois which is
+  unnecessary if accessing /etc directly. (rmillner@redhat.com)
+- specifying rake gem version range (abhgupta@redhat.com)
+
+* Tue Nov 13 2012 Adam Miller <admiller@redhat.com> 1.1.5-1
+- Merge remote-tracking branch 'origin-server/master' into BZ874587-origin
+  (bleanhar@redhat.com)
+- Merge pull request #881 from rmillner/wrongmcs (openshift+bot@redhat.com)
+- SS -> OPENSHIFT (dmcphers@redhat.com)
+- Was setting mcs label in the wrong place. (rmillner@redhat.com)
+- Fix for Bug 875949 (jhonce@redhat.com)
+- Bug 874587 - CLOUD_NAME in /etc/openshift/node.conf does not work
+  (bleanhar@redhat.com)
+
+* Mon Nov 12 2012 Adam Miller <admiller@redhat.com> 1.1.4-1
+- BZ 872379: Dead code cleanup to fix mount parsing problem.
+  (rmillner@redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller@redhat.com> 1.1.3-1
+- Merge pull request #857 from jwhonce/dev/bz874712_master
+  (openshift+bot@redhat.com)
+- Fix for Bug 874712 (jhonce@redhat.com)
+
+* Thu Nov 08 2012 Adam Miller <admiller@redhat.com> 1.1.2-1
+- Merge pull request #851 from brenton/no_trace (openshift+bot@redhat.com)
+- BZ873970, BZ873966 - disabling HTTP TRACE for the Broker, Nodes and Console
+  (bleanhar@redhat.com)
+- Increase the table sizes to cover 15000 nodes in dev and prod.
+  (rmillner@redhat.com)
+- BZ872523 - set quota for gear failed if the device name is too long
+  (bleanhar@redhat.com)
+- Merge pull request #698 from mscherer/fix_doc_node_bin
+  (openshift+bot@redhat.com)
+- do not use old name in the script help message (mscherer@redhat.com)
+
+* Thu Nov 01 2012 Adam Miller <admiller@redhat.com> 1.1.1-1
+- bump_minor_versions for sprint 20 (admiller@redhat.com)