added a note about the required cron cartridge.
only primary haproxy should sync and deploy
Fixing gem version requirement on sass-twitter-bootstrap
Merge pull request #3271 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3269 from kraman/master

Merged by openshift-bot
<admin/stats> add unit tests, fix a bug

Bug was that all nodes would be considered inactive
because it was not requesting the district_active fact.

Removed model/admin coverage exclusion. There were some
pieces of code that were too hard to exercise, will be left
for integration tests that can create users and apps for
the purpose.
<admin/stats> functional test to cover db scan method
<admin/stats> should fix oo-stats bug 988554

https://bugzilla.redhat.com/show_bug.cgi?id=988554
oo-stats throws exception - not clear what cart name was causing the
break, but this should fix it.
Merge pull request #3273 from sosiouxme/admin-stats-tests

Merged by openshift-bot
Fix runtime-extended tests for jboss cartridges

The jboss cartridge cartridge-lifecycle-jboss{as,eap}.feature scripts
were assuming all artifacts (exploded and archive) were being deployed
after multi-artifact deployment, when the deployment-scanner was
reverted back to deploying only archive artifacts it broke this
assumption.
Bug 991225: upgrade script should be run before setup during incompatible upgrade
Merge pull request #3276 from detiber/fixtests

Merged by openshift-bot
Handle race condition when trying to throttle gears that no longer exist
Merge pull request #3272 from lnader/master

Merged by openshift-bot
More language cleanup & consolidation
<oo-diagnostics> - Fixes for checks related to apache config

Update test_vhost_servernames to reference new filenames

Update test_broker_certificate to better detect mismatches between
ssl cert common name and apache configuration.
Merge pull request #3274 from pmorie/bugs/991225

Merged by openshift-bot
Merge pull request #3280 from fotioslindiakos/Bug991480

Merged by openshift-bot
Bug 989782: Node platform should not log user sensitive login name and password credentials

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

Various functions are logging the output from cartridge creation which
can contain sensitive information. Sanitizing this information in the
logger is the most central way to ensure we catch everything.
Merge pull request #3282 from nhr/updates

Merged by openshift-bot