Updating Rails 3 cartridge documentation no speed up deployment
Updated puppet guide with new config info
Fix failure when adding new proxy gear

Set rotate to false when invoking activate from update_cluster - there
is no need to rotate out/in new gears.

Fix bug in gear script with how rotate was being passed to the
container's activate method.

Bug 1022721
Fix unit test
Bug 1020555 - Add better process termination control to kill_procs and include it as the last step in idle.
Bug 1022370 - Add forcestopgear and forcestopall options to completely stop all processes owned by a gear.
Merge pull request #3976 from ncdc/no-rotation-on-scale-up

Merged by openshift-bot
Merge pull request #3977 from rmillner/BZ1020555

Merged by openshift-bot
Added absolute path to the performance.conf.erb.hidden in cartridges
Bug 1022439 - Restore missing httpd.pid when restarting PHP cart
abstract ssh "key" manangement and add support for k5login

added --with-ssh-key-type required arg to remove a key: must identify krb5

remove unneeded script

fixed typo in oo-devel-node per jliggitt

pass comment (key id) into krb5 change methods

fixed arg order in key_entry()

added unit test skeleton

try adding key ids for multiple add/remove

added skeleton kerberos k5login unit tests

added K5login initialization tests

add a sample file for read tests

added sample files and test injection inputs and modify() method read tests

tweaked initial state

added test for first principal

used setup() to avoid lots of duplicate initialization

moved initial k5login file path to setup

use _principal internally consistantly

added deep clone and compare

filled in remove principal id test

added formatting commentary

removed unneeded return in K5login.compare

added ownership and permission setting and overrides for unit testing

stubbed Etc.getpwnam calls to avoid permission errors

created test method skeletons for ssh authorized_keys tests

start test for replace k5 principals

added body and unit test code for replace_principals

refactored ssh_authorize_keys some to make it test friendly, started writing unit tests

start adding meat to auth keys unit tests, provide good ssh key validation

added a couple of comments to clever-validate

added test input and a couple of tests for ssh keys

two writes broken

use the default mode and allow override

added new_key test

unpend one complete test

added final remove tests

fixed typo: ssk (thanks Jordan)

preserve principals with nil IDs

preserve principals with nil ids

make key id optional
kerberos work for broker and console

Broker key tests

Read k5login_directory correctly out of krb5.conf

Make key comment optional for oo-devel-node
Merge pull request #3979 from mfojtik/bugzilla/1022439

Merged by openshift-bot
Merge pull request #3952 from jhadvig/rails_doc

Merged by openshift-bot
Merge pull request #3962 from nhr/puppet_guide_update

Merged by openshift-bot
Merge pull request #3903 from liggitt/krb5

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.16.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.16.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.16.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.16.2-1].