tree 5b759c9b2e6537ece117340676bdd0f76fdde474
parent 10b0abe0a56d1bcab2408f922bca9c50e47db97c
parent 0985ef8e1b6f526857f5343b16ee505c9e52870b
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