tree 51b16843cb37561dbd4a1b4fb215b5d557c46d9c
parent b9a987c5d2991d45e36a2c640b99d41415486627
parent ed70cf4a8e6f55a863a057e9c6d3dcc4ea8b3c3f
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450316083 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450316083 -0600

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