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 2014/02/21 10:14:10 UTC
[1/2] git commit: fixing status issue in the UI
Repository: incubator-stratos
Updated Branches:
refs/heads/master 5c5964130 -> 4851b4f46
fixing status issue in the UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/990ce0bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/990ce0bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/990ce0bc
Branch: refs/heads/master
Commit: 990ce0bcadd1b079576a428250014d7ebebeed93
Parents: 228b882
Author: rekathiru <rt...@gmail.com>
Authored: Fri Feb 21 14:43:21 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Feb 21 14:43:21 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme1/renderers/cartridges.js | 2 ++
.../console/themes/theme1/renderers/index.js | 3 ++-
.../console/themes/theme1/renderers/tenant_management.js | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990ce0bc/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
index 4e8e156..1242e0c 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
@@ -1,6 +1,8 @@
var render = function (theme, data, meta, require) {
// Re-create the data structure of the cartridges.
var log = new Log();
+ session.remove("get-status");
+ session.remove("deploy-status");
var cartridges_old = data.cartridges.cartridge;
var cartridges_new = [
{
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990ce0bc/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
index 28a0e67..ae680af 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
@@ -2,7 +2,8 @@ var render = function (theme, data, meta, require) {
// Re-create the data structure of the cartridges.
var cartridges_old = data.mycartridges.cartridge;
-
+ session.remove("get-status");
+ session.remove("deploy-status");
var cartridges_new = [
{
kind: "Framework",
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990ce0bc/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
index 8b676ab..8551bef 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
@@ -1,5 +1,6 @@
var render = function (theme, data, meta, require) {
-
+ session.remove("get-status");
+ session.remove("deploy-status");
var create_btn_class = 'btn-important';
var title = 'Tenant Management';
theme('index', {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4851b4f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4851b4f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4851b4f4
Branch: refs/heads/master
Commit: 4851b4f46fa3fa1e91048688032740f22f8ad8fa
Parents: 990ce0b 5c59641
Author: rekathiru <rt...@gmail.com>
Authored: Fri Feb 21 14:43:48 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Feb 21 14:43:48 2014 +0530
----------------------------------------------------------------------
.../publisher/HealthStatisticsReader.java | 22 ++++-
.../stratos/cli/RestCommandLineService.java | 84 ++++++++++++++++++++
.../apache/stratos/cli/StratosApplication.java | 3 +
.../stratos/cli/beans/TenantInfoBean.java | 28 +++++++
.../stratos/cli/commands/ListAllTenants.java | 65 +++++++++++++++
.../stratos/cli/commands/PartitionCommand.java | 1 -
.../apache/stratos/cli/utils/CliConstants.java | 5 ++
.../manager/client/AutoscalerServiceClient.java | 4 +
.../rest/endpoint/services/ServiceUtils.java | 2 +-
.../main/autoscale-policies/economyPolicy.xml | 20 ++---
.../distribution/src/main/conf/log4j.properties | 17 ++--
11 files changed, 227 insertions(+), 24 deletions(-)
----------------------------------------------------------------------