Merge remote-tracking branch 'origin/master'

Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/85c51163
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/85c51163
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/85c51163

Branch: refs/heads/master
Commit: 85c5116393b27bbb06677bc609cb9ce54bf14588
Parents: 9517502 9e95f8f
Author: Imesh Gunaratne <[email protected]>
Authored: Mon Dec 9 16:42:59 2013 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Mon Dec 9 16:42:59 2013 +0530

----------------------------------------------------------------------
 .../autoscaler/policy/PolicyManager.java        |  10 +-
 .../autoscaler/registry/RegistryManager.java    |   2 +-
 .../src/main/resources/AutoScalerService.wsdl   | 455 ++++++++++++++++++-
 3 files changed, 441 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


Reply via email to