Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Merge branch 'misc-dev'
Consistently silence pushd and popd in hooks

Consistently redirect the output of pushd and popd to /dev/null in
cartridge scripts.
Merge branch 'master' of github.com:openshift/origin-server
Fix tests to use newer-style rhc invocations

Change to the newer invocation style, order arguments consistently, and
delete global variables with paths to deprecated rhc executables.
Add @not-enterprise tag to some tests

The tests marked are for cartridges that are not in OpenShift Enterprise
at this time: 10gen, MongoDB, NodeJS, and PhpMyAdmin.  Also disabled for
Enterprise are lifecycle tests for the Ruby 1.8 cartridge; these tests
need to be updated.
Make a few clarifications in the README for PHP
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Plugin work, rearrange bits, add help, fix spec file.
Add missing routes.json configuration for jboss* app types + minor cleanup.
Case-insensitive vhost routing support.
Add missing routes.json configuration for jenkins apps.
Merge branch 'master' of github.com:openshift/origin-server
updated ews2 tests
Fix for Bug 893207

Add timeout for start/stop gear calls
spec file cleanup

move chmod to outside files section

add requires ruby

add comment to very short scripts

make a more secure temp file

change oo-diagnostics to use ruby tempfile

added requires rubygems and bind-utils for oo-diagnostics
Merge pull request #1122 from smarterclayton/improve_php_cartridge_readme

Merged by openshift-bot