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
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
oo-admin-ctl-domain: don't use CloudUser.new

Instead, use CloudUser.find_or_create_by_identity, which is now the
correct way to create a new account.
Use OPENSHIFT_*_DIR in standalone.conf

In the JBoss cartridges' standalone.conf file, use OPENSHIFT_JBOSSAS_DIR
or OPENSHIFT_JBOSSEAP_DIR as appropriate to set the value of CART_DIR.
oo-accept-broker: check httpd_execmem

Add httpd_execmem to the list of Booleans that check_selinux_booleans
checks.
Generic exceptions should always be handled with rescue_from
Don't return on the last line of controller methods
rescue_from handlers should have proper access to user info set via UserActionLog filter
Move most DocumentNotFound handling to ApiResponse#render_exception

Abstracts the details of not found errors globally to allow much simpler controller code.
Add test cases for not_found messages and behavior
Authorizations will not return specific id messages
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Bug 984811

As is the case with a very old cartridge, if both
OPENSHIFT_POSTGRES_VERSION and OPENSHIFT_POSTGRESQL_VERSION do
not exist in postgresql/env directory, create one with '8.4'.

Hard coding this value should be OK, since 8.4 was the only supported
version of PostgreSQL for the cartridge this condition ever applies.