safe yaml for parsing of downloaded yaml
Fix bug 964348
The update namespace functionality was removed.  Removing the supporting functions that only serviced that function.
Merge pull request #2542 from rajatchopra/master

Merged by openshift-bot
Merge pull request #2554 from pmorie/bugs/964348

Merged by openshift-bot
oo-accept-node changed the cgroups check to ignore defunct processes

Changed the oo-accept-node cgroups check to ignore defunct processes as these
processes can't consume any resources, so it's normal for the kernel to remove
them from cgroups.
Bug 965236: Restrict endpoint mappings to default route

Allow only primary and web_proxy cartridges to map to the default route
in Endpoint definitions.

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=965236
Merge pull request #2552 from rmillner/cleanup_namespace

Merged by openshift-bot
add generic-java hook
WIP Cartridge Refactor - V2 -> V2 Migration

* Add support for Manifest#compatible_versions
* Documentation update
Bug 964116: Postgres failed to restore snapshot

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

The `post_restore` function was attempting to delete the old user, even
if it was the same as the new user. This has been fixed.
Bug 965322 - Ruby always building 1.9.3 environment

* Only bundle using SCL 1.9.3 if configured Ruby version is 1.9
Improve error messages
Merge pull request #2558 from ironcladlou/bz/965236

Merged by openshift-bot
Merge pull request #2560 from bdecoste/master

Merged by openshift-bot
Merge pull request #2561 from jwhonce/wip/v2v2_migration

Merged by openshift-bot
Bug 965105: Cannot delete application
Bug 965322 - Use expected version of ruby to start httpd
do not save connections in mongo; regenerate them everytime we need to execute them
Merge pull request #2556 from twiest/dev/twiest/oo-accept-node/cgroups-defunct-procs

Merged by openshift-bot