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
Fix bug 980953 - allow conversion tracking
Console: Make sure excluded_tags is set

When listing the custom cartridge type (i.e., the diy cartridge), make
sure that excluded_tags in case it was not set earlier.  This commit
fixes bug 982882.
Bug 968252: Clean up old marker README files
Fix ApplicationStateFunctionalTest for F19
so that it creates test user in /var/tmp-tests instead of /tmp.
This avoids any poly-instantiated /tmp errors.
Bug 979740 - Fix Postgres cartridge using $HOME

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

The Postgres cartridge was using $HOME in some places, but it should be using $OPENSHIFT_HOMEDIR.
This is causing an unbound variable error.
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.
Bug 981528

reload/force-reload depends on application status, so both can be sent
to the cartridge
Changing error message to make it more clear
Bug 973796 - PassengerPreStart points at root which logs errors
Merge pull request #3036 from liggitt/bug_980953_adwords_script

Merged by openshift-bot