Bug 1015187: Replace curl with httpclient when downloading cartridges
Use .present? to check if the :http_proxy is configured
Use UnfulfilledRequirementException when manifest.yml is too big
Added HTTP_PROXY and CONN_TIMEOUT to broker.conf
Updating Rails 3 cartridge documentation no speed up deployment
Various deploy fixes

Certain containers (e.g. Tomcat) cache the path to the deployment
directory, and we want to replace the current deployment directory with
a new one when we activate a new deployment.

Replace app-root/runtime/{repo, dependencies, build-dependencies}
symlinks with actual directories. Sync content from the deployment
directory into these directories on activation.

Modify create_dependency_directories to create the directories in
app-root/runtime instead of in the deployment directory.

No need to create cartridge dependency directories any more when
creating a new deployment directory.

Recreate the cartridge dependency directories when building with
force_clean_build enabled.

Clean dependencies if preparing a binary deployment.

Don't use FileUtils.cd when creating the by-id link.

Specify --first-time when calling gear prereceive and gear postreceive
when doing an initial build so the pre_ and post_receive methods in the
container are invoked even though there's no commit data from STDIN.

Bug 1020660 - fix jbossews hot deploy
Bug 1021399 - fix nodejs 0.10 hot deploy
Bug 1021411 - fix nodejs 0.6 hot deploy
Bug 1021414 - fix nodejs 0.6/0.10 force clean build
Bug 1019723 - rhc deploy should activate all gears
Bug 1018387 - Drupal quickstart should no longer be broken
Bug 1021798 - fix Python 3.3 with Jenkins
Bug 1018654 - fix Jenkins hot deploy
Updated puppet guide with new config info
Various fine tuning and cleanup
Reduce space btw table and .btn-toolbar
Remove alert max-width because it's not needed.
Make .cartridge-block have a min-height so they are consistent by defaul
Mixin rules target origin logo to position vertically
@import new _tables partial since common no longer references the vendor default
Remove cartridge icon from app details. Looks better and embedded don't have specific icon so it was looking off.
Apply .row-content class to <sections> which apply default margin bottoms
Merge branch 'master' of github.com:sg00dwin/origin-server into console_light_theme_dev
Bug 1021462 - Pushing user variables failing if haproxy not installed

* Use same ssh settings as haproxy/bin/ssh
  -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=$OPENSHIFT_HOMEDIR/.openshift_ssh/known_hosts
  -F $OPENSHIFT_HOMEDIR/.openshift_ssh/config -i $OPENSHIFT_APP_SSH_KEY
Bug 1021722 - Create ~/.m2 for all jenkins gears
Fix oo-admin-ctl-user: Restrict large gears to free users with no billing account
Bug 1022015: Don't enable a disabled local gear on a git push.
Restore app-root symlinks

Restore code that created the
app-root/{repo,dependencies,build-dependencies} -> runtime/$dir
symlinks (it was accidentally removed).
Merge pull request #3964 from jwhonce/bug/1021462

Merged by openshift-bot
Merge pull request #3965 from jwhonce/bug/1021722

Merged by openshift-bot
Merge pull request #3966 from pravisankar/dev/ravi/restrict-large-gear-support

Merged by openshift-bot
Merge pull request #3967 from mrunalp/bugs/1022015

Merged by openshift-bot
Merge pull request #3955 from ncdc/copy-on-activate

Merged by openshift-bot
Merge pull request #3963 from sg00dwin/console_light_theme_dev

Merged by openshift-bot