tree 51b16843cb37561dbd4a1b4fb215b5d557c46d9c
parent cd74cf382d2104b0e0f2e5921c5362583cc19161
parent 40f683eec4f03187cdea7e166504ca46e5fff225
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