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
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.
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.
<broker> re-base the broker URI from /broker => /
<broker> fix tests against broker base URI change
Bug 980253 - Map illegal versions to 0.0.0

* Raising exception broke CDK which uses illegal version numbers
Test custom cart creation
Remove binding.pry, causing failures
Merge remote-tracking branch 'origin/master' into handle_global_exceptions_properly

Conflicts:
	console/test/integration/rest_api/authorization_test.rb
	controller/app/controllers/alias_controller.rb
Installation instruction updates