Modified directions so that manually create repo file will be updated by Puppet module when run
Fix bug 1101779

RPM can't handle directories being replaced by symlinks and
thus %pretrans workaround is needed.

Credit: Troy Dawson
Merge pull request #5404 from nhr/oo_install_doc_tweak

Merged by openshift-bot
Merge pull request #5454 from VojtechVitek/fix_ruby_rpm

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.25.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.25.3-1].
Bug 1102273: Make domain scopes additive
Ensure at least one scope's conditions are met, even when combined with complex queries
Bug 1101836: Apache shouldn't disable backend when it can't connect to it.
Bug 1101156 - Always initialize container_plugin
Merge pull request #5455 from liggitt/scope_complex_conditions

Merged by openshift-bot
Merge pull request #5456 from mrunalp/bug/1101836

Merged by openshift-bot
Merge pull request #5457 from jwhonce/bug/1101156

Merged by openshift-bot
oo-admin-gear: error out if we're not able to move the cgroup pid into the default group because the process does not exist or is a zombie process
Merge pull request #5126 from mmahut/handle_zombie

Merged by openshift-bot