bz1151744 - wrap the wait for reload to finish inside of the lockfile
Bug 1154521 - Fix the case when the system ruby is not installed
Merge pull request #5887 from mfojtik/oo-exec-ruby-2

Merged by openshift-bot
Bug 1146750 - Do not remove PI tmp directory when tidying
Merge pull request #5889 from jwhonce/bug/1146750

Merged by openshift-bot
oo-trap-user: Add support for OPENSHIFT_LOGIN environment variable

This variable, if set, is logged at the time of a gear ssh login to
enable auditing according to the actual owner of the ssh key.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
app container proxy: Add user login to ssh authorized_keys file

The OpenShift user login is provided with the ssh key to enable auditing
of gear logins according to the actual owner of the ssh key.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
mco agent: Fix single ssh key addition

The OpenShift user login is provided with the ssh key to enable auditing
of gear logins according to the actual owner of the ssh key.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
fix whitespace
ssh_authorized_keys: shell-escape the login

When the login is put into the env var for the command run as the shell,
it needs to be escaped so it doesn't become a command itself.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
ssh keys: remove special logins

Users with single-char logins should still be logged, and there doesn't
seem to be a good purpose for the special 'S' and 'A' logins. So, they
are now removed.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
oo-trap-user: make gear login syslog optional

Introduce node.conf setting SYSLOG_GEAR_LOGIN=true so that by default,
logging gear logins to syslogs occurs on a new install, but existing
nodes and node.conf files don't have this start happening without
intervention.

Bug 1134139 - [RFE] Track real person for gear SSH logins
https://bugzilla.redhat.com/show_bug.cgi?id=1134139
Merge pull request #5890 from sosiouxme/rfe1134139

Merged by openshift-bot
Merge pull request #5885 from rajatchopra/master

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.31.7-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.7.2-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.21.2-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.29.2-1].
Automatic commit of package [pam_openshift] release [1.12.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.30.4-1].