Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.20.1-1].
Automatic commit of package [openshift-origin-cartridge-diy] release [1.18.1-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.19.1-1].
Automatic commit of package [openshift-origin-cartridge-dependencies] release [1.20.1-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.19.1-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.20.1-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [1.19.1-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.18.1-1].
Automatic commit of package [openshift-origin-broker-util] release [1.20.1-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.21.1-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.30.1-1].
Automatic commit of package [openshift-origin-node-util] release [1.19.1-1].
Bug 1059458
default to Rails.configuration if show_obsolete is nil
Merge pull request #4628 from lnader/master

Merged by openshift-bot
Add external cartridge support to model

Ensure that imported downloadable cart manifests make it all the way
to the component creation.
Decorate some objects with more metadata.
Allow cartridges to be retrieved by id
Typo in init_gear_op and missing join! for async
Display more helpful info into operation execution
Return an attribute for cartridges that don't receive security updates
Tolerate custom cartridges in the broker in the console

React more appropriately to a custom cart showing up in the app types
list and the cart types list.  Other small view / behavior tweaks.
Broker should allow version to be specified in Content-Type as well
Merge remote-tracking branch 'origin/master' into origin_broker_193_carts_in_mongo

Conflicts:
	controller/app/controllers/cartridges_controller.rb
	controller/app/helpers/cartridge_cache.rb
	controller/app/models/application.rb
	plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb
Merge pull request #4594 from smarterclayton/tolerate_custom_carts_in_broker

Merged by openshift-bot