Bump up version
Automatic commit of package [rubygem-openshift-origin-dns-avahi] release [1.10.2-1].
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
remote-user: Fix .conf migration in %post

If the remote-user auth plug-in is installed but is not enabled at the
time of an upgrade, its httpd configuration file may not be present.  In
order to avoid causing an error during a package upgrade, only modify
the file if it is present.
Bug 971586

Set up cron's PATH to use primary cartridge's *_PATH_ELEMENT so that
cron can use the cartridge's executables.
Mimic rhcsh logic more closely

Ensure the primary cartridge's *_PATH_ELEMENT wins
Bug 980102

The original link $OPENSHIFT_REPO_DIR/../node_modules is wrong.
The one we need is $OPENSHIFT_NODEJS_DIR/node_modules, which
will be used in build() if deplist.txt is present.

There is another occurrence of 'npm install', but that happens in
$OPENSHIFT_REPO_DIR, to which we have write access.

For existing nodejs applications, we simply remove the dangling symlink.

To test, create a Node.js app, then add a module (say 'coffee-script')
to deplist.txt, add and commit this change, and push.
haproxy_ctld_daemon.rb: Fix backtrace option

The haproxy_ctld_daemon.rb script in the haproxy cartridge had a typo:
':backgrace' instead of ':backtrace'.

This typo appears to have been present since haproxy_ctld_daemon.rb was
introduced in commit ee8cebbe1adb351a3b80ca3fda4f047aee8fac1b.
openshift_facts.rb: sort cart_list
Routing plug-in for broker. Code base from github/miciah/broker-plugin-routing-activemq
Merge pull request #2977 from BanzaiMan/dev/hasari/bz980102

Merged by openshift-bot
Cleaned up asciidoc per feedback from @mojavelinux, added analytics content to doc template
Merge pull request #2988 from nhr/big_cleanup

Cleaned up asciidoc per feedback from @mojavelinux
fix runtime extended tests
Merge pull request #2985 from danmcp/master

Fixing runtime extended tests
Merge pull request #2987 from rajatchopra/routing_broker

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-container-selinux] release [0.0.2-1].
artificial bump to get build reporting back in line