fix assignation of postgresql_dburl, using a inexistant variable
remove duplicate definition of function ( since there is the exact
same code before in the file, with added debug statement )
fix and factorise the function for the list of users as openshift_users
do not match on the same exact list of people than valid_user ( due to code duplication
and subtle difference between the copies )
Bug 887353: removing a cartridge leaves info/ dir

This commit adds each cartridge's %{cartridgedir}/ directory as well as its
%{cartridgedir}/info/ directory to the %files stanza of the cartridge so
that RPM recognises these directories as belonging to the cartridge and
removes them when the RPMs are removed.

Following the example of the python-2.6 cartridge, which already has these
directories in its %files stanza, this commit uses %dir for the
%{cartridgedir}/ and %{cartridgedir}/info/.  We do need the default
permissions (0755) on these two directories so that the MCollective agent
can read the info/ directory.

This commit fixes Bug 887353.
Automatic commit of package [openshift-origin-broker] release [1.1.2-1].
Automatic commit of package [openshift-origin-util] release [1.0.4-1].
Automatic commit of package [rubygem-openshift-origin-auth-kerberos] release [1.1.2-1].
Automatic commit of package [rubygem-openshift-origin-auth-mongo] release [1.1.2-1].
rebase on latest version
Bug 904100: Tolerate missing Endpoint cart manifest entries

Skip endpoint creation if no Endpoints item is present in a given
cart manifest. Carts with no Endpoints is a valid state.
remove consumed_gear_sizes
Fix Broker extended tests, Don't call observers for cloud user model if the record is already persisted.

Fix Cloud user unit tests
Merge pull request #1233 from danmcp/master

Fixing Bugs
Merge pull request #966 from mscherer/fix/node-util/fix_duplicate_functions

Merged by openshift-bot
cartridge name validation fix BZ869196
refix oo-admin-chk - remove pagination; minor fix with group override matching
Bug 874594
Bug 888550
Merge pull request #1117 from mscherer/fix_better_cgroup_listing

Merged by openshift-bot
Merge pull request #943 from mscherer/fix/cartridge/typo_in_pgsql_url

Merged by openshift-bot
Merge pull request #1235 from danmcp/master

Fixing Bugs