Add retries in functional api
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
mysql cartridge was using a postgresql variable
Bug 1033581 - Adding upgrade logic to remove the unneeded jenkins_shell_command files

This is the squashed version of https://github.com/openshift/origin-server/pull/4424
disable_assets_compilation
<comprehensive deployment guide> Fix unterminated code block

Section 9.7.2 ("Install front-end plugins") contained a code block
that wasn't closed properly. This broke formatting for most of the
document that followed.
Bug 984867 - Hardcode port 80 for PassengerPreStart
Merge pull request #4441 from dobbymoodge/fix_adoc

Merged by openshift-bot
Merge pull request #4434 from brenton/BZ1033581_rebase1

Merged by openshift-bot
Card origin_runtime_21 - Enable BUNDLE_WITHOUT env variable for Ruby
Update cartridge guide for BUNDLE_WITHOUT
Give better messaging around starting jenkins
catching an exception if the proxy connection is closed
Merge pull request #4443 from danmcp/master

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.17.3-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.19.3-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.19.4-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.19.5-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.12.2-1].