Automatic commit of package [openshift-origin-cartridge-ruby] release [1.20.4-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [1.19.4-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.18.3-1].
Automatic commit of package [openshift-origin-cartridge-switchyard] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.21.4-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.30.4-1].
Merge pull request #4674 from fabianofranz/dev/155

Merged by openshift-bot
Merge pull request #4750 from pravisankar/dev/ravi/bug1028919

Merged by openshift-bot
add test for jboss snapshot/restore that includes app content
Bug 1063764 and 1064239:
 - Unsubscribe connections was not being called
 - ALLOW_MULTIPLE_HAPROXY_ON_NODE config was not being honored
Merge pull request #4733 from abhgupta/abhgupta-dev

Merged by openshift-bot
Activate obsolete cartridges in devenv
Merge pull request #4752 from bparees/restore_test

Merged by openshift-bot
Bug 1064650 - oo-admin-ctl-cartridge handles bad input
Merge pull request #4754 from smarterclayton/activate_obsolete_carts

Merged by openshift-bot
Corrected MCollective log locations in comprehensive guide
Merge pull request #4755 from smarterclayton/bug_1064650_return_error_on_bad_input

Merged by openshift-bot
Fix for bug 1064838 and partial fix for bug 1064141
 - Setting comp_spec attributes for ha apps only if the app is ha
 - fixing a typo in variable name where 'gear' was used instead of 'g'
Bug 1064219 - handle iptables rules

Via rpm itself, copy over iptables rules configs and backups from
/etc/openshift to /var/lib/openshift/.httpd.d before installing
new files and delete old files after the upgrade.

also, do not delete *.rpmnew in %post

	modified:   node/rubygem-openshift-origin-node.spec
Fixes site_extended tests