Add currency_cd field to CloudUser
Merge pull request #5595 from abhgupta/abhgupta-dev

Merged by openshift-bot
Bug 1118588 - Fix oo-cgroup-read for parsing blkio stats
oo-accept-systems: Fix check_nodes_cartridges

Fix the check_nodes_cartridges test in oo-accept-systems to get the list
of cartridges the correct way rather than trying to use the "cart_list"
fact, which has been deprecated for several releases.

With commit 4e94c47a381f3cfd168e9add0383414202aa96e5, the cart_list fact
is no longer updated, so the check was essentially a no-op (no nodes
would respond with the fact, so the carts_for Hash would remain empty,
which would cause the test to terminate silently).

This commit fixes bug 1118908.
oo-accept-systems: Better output in carts check

Improve the output in the check_nodes_cartridges check of
oo-accept-systems: Sort cartridges before printing in order to make it
easier to compare lists, and use consistent formatting.
Merge pull request #5598 from a13m/bz1118588m

Merged by openshift-bot
Merge pull request #5599 from Miciah/bug-1118908-oo-accept-systems-fix-check_nodes_cartridges

Merged by openshift-bot
Updated oo-install guide for v4
Merge pull request #5601 from nhr/oo_install_update

Merged by openshift-bot
Updated Comprehensive Deployment Guide for v4
Interim change for v4 - all docs built from master.
oo-diagnostics: Read /proc instead of using ps

In test_mcollective_context, read /proc/#{pid}/attr/current to determine
the process's domain instead of using using the output of ps, which is
affected by mcstransd.

This commit fixes bug 1119923.
Merge pull request #5603 from nhr/comprehensive_guide_update

Merged by openshift-bot
Merge pull request #5605 from nhr/v4_docs_interim_rake_change

Merged by openshift-bot
Merge pull request #5594 from liggitt/add_currency_code

Merged by openshift-bot
Merge pull request #5606 from Miciah/bug-1119923-oo-diagnostics-read-slashh-proc-instead-of-using-ps

Merged by openshift-bot
OAuth - should be able to specify what HTTP method is being used when signing a request
Merge pull request #5610 from jwforres/oauth_specify_method

Merged by openshift-bot
Initial support for Ruby 2.0
Update Rest API Integration test for ruby-2.0 cartridge