Quickfix for cartridge-dependencies packages
Oddjobd fails if messagebus isn't running
Fix resource ordering for httpd_certificate to ensure httpd package is available
Merge pull request #333 from sdodson/fixOddjobd

Oddjobd fails if messagebus isn't running
Merge pull request #336 from detiber/fix_httpd_certificate_ordering

Fix resource ordering for httpd_certificate to ensure httpd package is available
Merge branch 'add-openshift-origin-cartridge-dependencies' of github.com:andrewklau/puppet-openshift_origin into add-openshift-origin-cartridge-dependencies

Conflicts:
	manifests/init.pp
Merge pull request #338 from sdodson/add-openshift-origin-cartridge-dependencies

Add openshift origin cartridge dependencies

Going ahead with it as is. We can revisit different implementation details in the future if this turns out to be confusing to users.
Adding TLS encryption to Mcollective