altered the messaging to reflect the suggestions given.
Merge pull request #1357 from kraman/master

Merged by openshift-bot
remove use of filesystem cgroup countrol

use cgclassify to set initial cgroup

setup stock cgroups, no systemd mods

check user cgroups using lscgroups

switced oo-cgroup-read to use cgget

fixed python typo in ruby

fixed extra end and arguments to check_user_cgroups

remove unneeded comma, split args for subprocess.call

log error on fail, with more information

enable cgroup_pam

added build prefix to pam.d/sshd update

added build prefix to pam.d/sshd update

removed pam_cgroup in sshd on uninstall

better code for node postinstall

remove use of filesystem cgroup countrol

use cgclassify to set initial cgroup

setup stock cgroups, no systemd mods

check user cgroups using lscgroups

switced oo-cgroup-read to use cgget

fixed python typo in ruby

fixed extra end and arguments to check_user_cgroups

remove unneeded comma, split args for subprocess.call

log error on fail, with more information

Bug [906687] - Lacking usage info of oo-cgroup-read command

enable cgroup_pam

added build prefix to pam.d/sshd update

added build prefix to pam.d/sshd update

removed pam_cgroup in sshd on uninstall

better code for node postinstall

moved pam.d/sshd update from postinstall to oo-setup-node

convert abstract cgroup get/set to libcgroup-tools

revert util to master and try again

restored libcgroup operations to abstract util
Bug [906687] - Lacking usage info of oo-cgroup-read command
Merge pull request #1278 from markllama/feature/node/cgroup-unify

Merged by openshift-bot
added new admin script to list usage for a user
Merge pull request #1358 from abhgupta/abhgupta-dev

Merged by openshift-bot
making usage filter a generic hash
Merge pull request #1360 from abhgupta/abhgupta-dev

Merged by openshift-bot
Revert "Moved async_aware into the models"

This reverts commit 55b8271886664b88eea00d4303507ee8f83396e5.

Conflicts:
	console/app/controllers/applications_controller.rb
	console/app/models/application.rb
Bug 908607 - Make application overview page faster
read from primary - bz910610
Merge pull request #1362 from rajatchopra/master

Merged by openshift-bot
WIP Cartridge Refactor

* Added application_state.rb and environ.rb plus unit tests
* Added README.writing_applications.md
WIP Cartridge Refactor

* Added oo_trap_user.rb
* Update documentation
* Fix application container tests
* Add initial mock cartridge
* Test tidy and destroy
* Added oo-user-ctl-gear
* Refactored application_container to support start/stop/...
* add ApplicationContainer#{add,remove}_cart
Automatic commit of package [openshift-origin-cartridge-mock] release [0.2-1].
wip: mock readme
Automatic commit of package [openshift-origin-cartridge-mock] release [0.3-1].
Automatic commit of package [openshift-origin-cartridge-mock] release [0.4-1].

wip

Re-version mock RPM to 0.0.1

Automatic commit of package [openshift-origin-cartridge-mock] release [0.0.2-1].
WIP Cartridge Refactor

* Added shell_exec_test.rb
* Updated documentation
* Continued platform development
* Fixed killing off timed out commands in shell_exec
* Implement Endpoints to version 2 cart specification
* ApplicationState bug and test fixes
* Use ApplicationContainer in test API
* Added cgroups to oo-trap-user.rb
* Cleaned up raw port of python code of oo-trap-user
* Improved unit test coverage

Move pure unit tests which can be run locally into test/unit. Move "functional" tests
which require root/devenv into test/functional.

Add two new Rake tasks for test executions:
  - unit_test: runs all test/unit tests
  - func_test: runs all test/functional tests
  - test: runs both unit_test and func_test

This establishes a hard line between tests which a developer can run and rely upon
for local development testing and those which are useful only when executed on a
devevelopment instance.

* Change env load order
* Unified runtime cucumber test API

Consolidate cart operation entrypoints through ApplicationContainer and
update the runtime test API to be compatible with both V1 and V2 cart
models.

Update all cartridge manifests to be compatible with the latest cartridge
manifest spec.