You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pu...@apache.org on 2015/11/12 11:14:30 UTC
[2/2] stratos git commit: Merge branch 'stratos-4.1.x' of
https://github.com/apache/stratos into test-fix
Merge branch 'stratos-4.1.x' of https://github.com/apache/stratos into test-fix
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a62c8ce7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a62c8ce7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a62c8ce7
Branch: refs/heads/stratos-4.1.x
Commit: a62c8ce79745a8f6d6f7b55cde9cca065c2d1f0f
Parents: 443f20a 10ea238
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Thu Nov 12 15:43:49 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Thu Nov 12 15:43:49 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 2 +-
.../common/partition/NetworkPartitionRef.java | 5 +
.../console/applications_form.jag | 2 +-
.../console/controllers/menu/menu_generator.jag | 4 +-
.../Dashboard/artifact.xml | 2 +-
.../Dashboard/metering-dashboard.json | 229 ++++++++++++++++
.../Dashboard/stratos-metering-dashboard.json | 229 ----------------
.../js/member-details-filter.js | 30 +-
.../metering-dashboard/ues-patch/README.md | 2 +-
.../metering-dashboard/ues-patch/dashboard.jag | 130 ++++-----
.../ues-patch/ues-dashboards.js | 211 --------------
.../metering-dashboard/ues-patch/ues-gadgets.js | 175 ++++++++++++
.../metering-dashboard/ues-patch/ues-pubsub.js | 20 +-
.../Dashboard/artifact.xml | 2 +-
.../Dashboard/monitoring-dashboard.json | 225 +++++++++++++++
.../Dashboard/stratos-monitoring-dashboard.json | 274 -------------------
extensions/das/modules/distribution/pom.xml | 2 +-
.../src/main/conf/cartridge-config.properties | 4 +-
18 files changed, 716 insertions(+), 832 deletions(-)
----------------------------------------------------------------------