remove unnecessary cart-data variable descriptions
remove zend-5.6 rest_api tests
Merge pull request #4492 from VojtechVitek/obsolete_zend-5.6

Merged by openshift-bot
Bug 1053782 - Make sure httpd restart succeed for broken httpd
Card origin_node_374 - Port Watchman to Origin

* tests for CachedConfig
@port_begin also uses PROXY_MIN_PORT_NUM

Signed-off-by: lsm5 <lsm5@redhat.com>
add PORT_BEGIN parameter to oo-accept-node

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
minor typo fix

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
keep consistency for new parameter description

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
lookup both old and new conf values BZ #1051015)

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
do not use new values in node.conf BZ #1051015

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
check for old and new port num variables

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
correct if else syntax

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
check for PROXY_MIN_PORT_NUM if PORT_BEGIN undefined

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
check for old node conf vars if newer undefined

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

new: UID_BEGIN old: GEAR_MIN_UID
new: PORT_BEGIN old: PROXY_MIN_PORT_NUM
new: PORTS_PER_USER old: PROXY_PORTS_PER_GEAR
correct if else syntax

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Merge pull request #4493 from mfojtik/bugzilla/1053782

Merged by openshift-bot
Bug 1051203
Card origin_node_374 - Port Watchman to Origin

* Added work around for restart in Daemons code.  Work around required
  until we upgrade beyond Deamons 1.1.0
* Added Starting/Stopping/Restarting messages
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.10-1].