Add prohibited email domain configuration.
<oo-admin-ctl-cgroups> whitespace fixes

Fixing up whitespace prior to code fixes
<oo-admin-ctl-groups> Fix typos in echo statements

Stray "$" found its way into the start of some echo (cut n paste?)
This commit fixes them
<oo-admin-ctl-cgroups> Fix return value handling, code fixes/refactoring

This commit updates the script functions to properly capture return
codes from subcommands. The code has been refactored to accumulate
return codes in function-local variables and pass the accumulated
values via returns, instead of using global vars.

startall has been modified to properly react to the return code from
add_cgroup failure

Added optional parameter to usage string for status command
<oo-admin-ctl-cgroups> Bug 964205 - add "repair" command

This commit adds a new command to oo-admin-ctl-cgroups called
"repair". This command identifies users which lack a cgroup and
creates a cgroup for them. It can be called with an optional username
argument (or a quoted space-separated list of usernames) to restrict
the action to a specific subset.

The "restartall" command remains functionally unchanged - this will be
addressed in the next commit
<oo-admin-ctl-cgroups> Bug 964205 - prevent stopping already stopped cgroups

Modified stopuser() to check if the cgroup for the specified user has
already been stopped, and echo a useful message if that is the case
instead running cgdelete and generating "file not found" noise
<oo-admin-ctl-groups> Bug 964205 - fix set_blkio function comment to be more accurate
vendoring of cartridges
fix some broken tests
Replace pre-receive cart control action with pre-repo-archive

There is no longer any use case for the pre-receive control action. Replace it with
a pre-repo-archive control action which occurs during the build cycle during Git
post-receive but before the Git repository is exported to OPENSHIFT_REPO_DIR. This
supports a known use case (Ruby asset management).
Merge pull request #2638 from rajatchopra/master

Merged by openshift-bot
Bug 967118 - Make Platform/Cartridge shared files immutable

* Add OpenShift::ManagedFiles::IMMUTABLE_FILES
* Remove immutable files from all lock/unlock lists
* Refactor cartridge create to protect these files
Bug 967118 - Remove redundant entries from managed_files.yml

* Removed all occurances where locked_files was protecting just managed_files.yml
  and manifest.yml. Platform ensures those are immutable.
Merge pull request #2641 from ironcladlou/dev/v2carts/build-system

Merged by openshift-bot
Merge pull request #2642 from jwhonce/bug/967118

Merged by openshift-bot
Various cleanup
Merge pull request #2643 from danmcp/master

Merged by openshift-bot
Bug 962657: Return db info to client during postgres install
Bug 966963: Remove unnecessary versioned conf files from php cart

The php 5.3/5.4 configuration files all symlink back to shared. Remove the specific version
directories/files and use only the shared directory for setup. This also fixes a bug where
the symlinks to shared become broken during setup (as ERBs are removed during processing)
and cause the remaining symlinks to be re-processed as ERBs (which fails).
Merge pull request #2644 from ironcladlou/bz/962657

Merged by openshift-bot