Bug 976112

Some node.js application migration may fail if the existing application
has a real directory `$OPENSHIFT_NODEJS_DIR/versions/0.6`.
Since we are copying the files over from the new version of the
cartridge, simply remove the files during migration so that `cp -ad`
does not fail.
<oo-diagnostics> Bug 976874 - Detect abrt-addon-python conflicts

https://bugzilla.redhat.com/show_bug.cgi?id=976874

abrt-addon-python does not play nicely with the python cartridge, alert
if the following conditions are met:
1) RHEL 6.4 (RHEL 6.5 will contain an update to abrt-addon-python)
2) abrt-addon-python installed
3) python v2 cart installed
Merge pull request #2918 from detiber/abrtyerkillinme

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-cron] release [1.8.4-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.5.4-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.10.4-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.3.6-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.5.5-1].
Automatic commit of package [openshift-origin-node-util] release [1.10.4-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.5.5-1].
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.10.4-1].
Automatic commit of package [openshift-origin-cartridge-switchyard] release [0.3.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.4.6-1].
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.10.4-1].
Bug 975794: Move oo-admin-cartridge operations to %posttrans

The oo-admin-cartridge command isn't safe to use in %post the way we currently
install the package; during %post, the previous RPM version files haven't been
cleaned up, meaning we install from a source tree containing a mixture of old
and new cartridge version files.

Move the operation to %posttrans, which guarantees the install picks up the final
installed package state, and thus only files from the new RPM installation.
Merge pull request #2920 from ironcladlou/bz/975794

Merged by openshift-bot
WIP Cartridge - Correct manifest.yml

* Fixed Cart-Data to use PYTHON instead of PERL
Merge pull request #2921 from jwhonce/wip/cartridge_change_audit

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.5.4-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.3.7-1].