This directive throws a deprecation warning in apache 2.4
deployment_guide_comprehensive formatting and minor fix
Fix cart props split value
Cleanup cartridge dependencies

Remove facter from cartridge dependencies

Remove httpd from cartridge dependencies, already provided elsewhere

Cleanup more cartridge dependencies

Cleanup more cartridge dependencies in ruby and php

Added to dependencies package for ruby and php
Obsoleted zend-5.6 cartridge
Bug 1063677 - Show apache running info when run "rhc cartridge status" for python app
Rebalancing cart extended tests
Merge pull request #4722 from jhadvig/python_apache_info

Merged by openshift-bot
Bug 1019219 - PassEnv warning messages are shown when deploy app
Merge pull request #4724 from danmcp/master

Merged by openshift-bot
Merge pull request #4712 from tdawson/2014-02/tdawson/cartridge-deps

Merged by openshift-bot
Bug 997374 - Fix typo
Bug 1063278 - kill user processes before user

	modified:   node-util/sbin/oo-admin-gear
Merge pull request #4725 from jhadvig/passenv_apache

Merged by openshift-bot
Bug 1045224 - install iptables rules in new dir

install iptables.*.rules in /var/lib/openshift/.httpd.d instead of
/etc/openshift.

solve 'files listed twice' warning during rpmbuild for
rubygem-openshift-origin-node

	modified:   node/misc/bin/oo-iptables-port-proxy
	modified:   node/misc/sbin/oo-admin-ctl-iptables-port-proxy
	modified:   node/rubygem-openshift-origin-node.spec
Merge pull request #4718 from lnader/master

Merged by openshift-bot
Merge pull request #4727 from danmcp/master

Merged by openshift-bot
Merge pull request #4728 from lsm5/oo-admin-gear-test

Merged by openshift-bot
Merge pull request #4720 from lsm5/new-iptables2

Merged by openshift-bot
Bug 1063703: Assume ws if websocket is true.