tree aa23b4e5fd0668b6b8bfbd6ec3545a67d2e113cb
parent 4ec40763530e1e1573cd41ab8a82bc107775c7d9
parent cad4e74593e224bd81d58bf9228920b28e916580
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450393190 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1450393190 -0600

Merge branch 'master' into xos_auto_scaling_app_changes