US3350 - Expose a plan_upgrade_enabled capability that indicates whether users can select a plan
Fix for node proxy file list getting truncated.
Review - use 'caps' instead of 'cap' for shortname
Fix for bug 906266, bug 906230, and bug 906233
Sort test results for comparison
Add tomcat version tags so that new RHC will allow 'rhc app create foo tomcat6'
Cleanup old/first invalid changelog entry.
Fix bug where first provider is used by the broker and it ends up switching
between python 2.7 and python 3.3 on a db add. Set the first provider to
the specific cartridge name.
Merge pull request #1252 from smarterclayton/us3350_establish_plan_upgrade_capability

Merged by openshift-bot
fix instability of ci tests
Merge pull request #1262 from mrunalp/bugs/node_proxy_buf

Bug 906586: Fix for node proxy file list getting truncated.
Bug 906603
Handle race condition creating user with concurrent calls
Merge pull request #1260 from abhgupta/abhgupta-dev

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

Handle race condition creating user with concurrent calls
Merge pull request #1263 from smarterclayton/search_tomcat_cartridge_names

Merged by openshift-bot
US2626 changes based on feedback
- Add application name in Usage and UsageRecord models
- Change 'price' to 'usage_rate_usd' in rest cartridge model
- Change 'charges' to 'usage_rates' in rails configuration
- Rails configuration stores usage_rates for different currencies (currently only have usd)

Pass app name to track_usage

Add app_name to usage model unit tests
Merge pull request #1266 from ramr/master

Merged by openshift-bot
Merge pull request #1267 from pravisankar/dev/ravi/us2626-feedback

Merged by openshift-bot
Merge pull request #1269 from rajatchopra/master

Merged by openshift-bot
Bug 906671: Fix log location in Ruby tidy hook

Fix the Ruby tidy hooks to clean logs from the correct location.

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