tree 7214c78f2b9090928e23dccdd01a628dc49bff24
parent 298b78eeeed5f7a5a283dcce908d52ce7666a206
parent 6ca577c1fe12c1cd9fe44622474d7e1794e14d95
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