Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94235223 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94235223 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94235223 Branch: refs/heads/master Commit: 94235223544ec30f555419f509f52e7ad1e9b78a Parents: 7e8c3df bb54544 Author: anuruddhal <[email protected]> Authored: Tue May 19 21:33:49 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Tue May 19 21:33:49 2015 +0530 ---------------------------------------------------------------------- .../applications/ApplicationUtils.java | 4 +-- ...ApplicationPolicyAlreadyExistsException.java | 3 +-- .../monitor/component/ApplicationMonitor.java | 2 +- .../monitor/component/GroupMonitor.java | 14 +++++------ .../autoscaler/services/AutoscalerService.java | 2 +- .../cloud/controller/domain/Partition.java | 2 +- .../openstack/networking/NovaNetworkingApi.java | 2 +- .../impl/CloudControllerServiceImpl.java | 3 +-- .../NetworkPartitionReferenceBean.java | 2 -- .../publisher/wso2/cep/ThriftClientConfig.java | 2 +- .../balancer/conf/structure/NodeBuilder.java | 26 ++++++++++---------- .../console/themes/theme0/css/custom.css | 4 +++ .../themes/theme0/partials/login_body.hbs | 2 +- .../util/converter/ObjectConverter.java | 14 +++++------ 14 files changed, 41 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
