Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Conflicts:
service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6b86f4a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6b86f4a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6b86f4a7
Branch: refs/heads/master
Commit: 6b86f4a733b7c470560ebb01f1e1bfbe9be6c516
Parents: ebf59c8 46efc80
Author: Udara Liyanage <[email protected]>
Authored: Wed Dec 4 16:25:49 2013 -0500
Committer: Udara Liyanage <[email protected]>
Committed: Wed Dec 4 16:25:49 2013 -0500
----------------------------------------------------------------------
.../balancer/common/statistics/WSO2CEPStatsPublisher.java | 10 ++++++----
.../balancer/internal/LoadBalancerServiceComponent.java | 7 ++-----
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
