tree 7214c78f2b9090928e23dccdd01a628dc49bff24
parent e1a34e829b0c1aad231d128f2fc41e6914f1528a
parent 95029ba2f00424178c0c87a95459d0cf6186f3df
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450393099 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450393099 -0600

Merge branch 'xos_auto_scaling_app_changes' of https://github.com/open-cloud/xos into xos_auto_scaling_app_changes