tree 5b759c9b2e6537ece117340676bdd0f76fdde474
parent 09b278de415cee8723a93c93102aad361c0a84b7
parent 7bdfbed8fb43b4ad44c3731f9c812a244e2b7aea
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450548530 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450548530 -0600

Merge branch 'master' into xos_auto_scaling_app_changes