You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 16:13:35 UTC
[08/23] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fd4a7986
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fd4a7986
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fd4a7986
Branch: refs/heads/master
Commit: fd4a79869c5358ebd3b148b89368ba8e755be0c6
Parents: 5757f1e bb54544
Author: Dinithi <di...@wso2.com>
Authored: Tue May 19 20:45:51 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 19 20:45:51 2015 +0530
----------------------------------------------------------------------
.../applications/ApplicationUtils.java | 4 +--
.../context/cluster/ClusterContext.java | 12 +++------
.../context/cluster/ClusterContextFactory.java | 4 +--
...ApplicationPolicyAlreadyExistsException.java | 3 +--
.../monitor/component/ApplicationMonitor.java | 2 +-
.../monitor/component/GroupMonitor.java | 14 +++++------
.../autoscaler/services/AutoscalerService.java | 2 +-
.../services/impl/AutoscalerServiceImpl.java | 25 +++++++++++++++----
.../cloud/controller/domain/Partition.java | 2 +-
.../openstack/networking/NovaNetworkingApi.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 3 +--
.../NetworkPartitionReferenceBean.java | 2 --
.../common/client/AutoscalerServiceClient.java | 4 +--
.../publisher/wso2/cep/ThriftClientConfig.java | 2 +-
.../balancer/conf/structure/NodeBuilder.java | 26 ++++++++++----------
.../console/controllers/menu/menu.json | 2 +-
.../console/themes/theme0/css/custom.css | 4 +++
.../themes/theme0/partials/login_body.hbs | 2 +-
.../rest/endpoint/api/StratosApiV41.java | 5 ++++
.../rest/endpoint/api/StratosApiV41Utils.java | 3 ++-
.../util/converter/ObjectConverter.java | 14 +++++------
21 files changed, 77 insertions(+), 60 deletions(-)
----------------------------------------------------------------------