You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2015/04/04 20:22:34 UTC

[1/2] stratos git commit: Redirect /console when clicked on Stratos logo on error pages

Repository: stratos
Updated Branches:
  refs/heads/master 2a7f2758e -> 571bda5d5


Redirect /console when clicked on Stratos logo on error pages


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d4c581c3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d4c581c3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d4c581c3

Branch: refs/heads/master
Commit: d4c581c3326f0441b0412bd1e15837867d01ea8f
Parents: 2a7f275
Author: Chamila de Alwis <ch...@apache.org>
Authored: Sat Apr 4 16:34:02 2015 +0530
Committer: Chamila de Alwis <ch...@apache.org>
Committed: Sat Apr 4 23:52:02 2015 +0530

----------------------------------------------------------------------
 .../console/errorhtml/error-404.html                               | 2 +-
 .../console/errorhtml/error.html                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/d4c581c3/components/org.apache.stratos.manager.console/console/errorhtml/error-404.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/errorhtml/error-404.html b/components/org.apache.stratos.manager.console/console/errorhtml/error-404.html
index 27c7b3d..ae6e92e 100644
--- a/components/org.apache.stratos.manager.console/console/errorhtml/error-404.html
+++ b/components/org.apache.stratos.manager.console/console/errorhtml/error-404.html
@@ -38,7 +38,7 @@
                 <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span
                     class="icon-bar"></span><span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand logo" href=""><img src="/console/themes/theme0/images/stratos-logo.png"></a>
+            <a class="navbar-brand logo" href="/console"><img src="/console/themes/theme0/images/stratos-logo.png"></a>
         </div>
 
     </div>

http://git-wip-us.apache.org/repos/asf/stratos/blob/d4c581c3/components/org.apache.stratos.manager.console/console/errorhtml/error.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/errorhtml/error.html b/components/org.apache.stratos.manager.console/console/errorhtml/error.html
index 0fd1d65..2b77386 100644
--- a/components/org.apache.stratos.manager.console/console/errorhtml/error.html
+++ b/components/org.apache.stratos.manager.console/console/errorhtml/error.html
@@ -38,7 +38,7 @@
                 <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span
                     class="icon-bar"></span><span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand logo" href=""><img src="/console/themes/theme0/images/stratos-logo.png"></a>
+            <a class="navbar-brand logo" href="/console"><img src="/console/themes/theme0/images/stratos-logo.png"></a>
         </div>
 
     </div>


[2/2] stratos git commit: Fixing complex-app undeploy to remove deployment policy and network partition

Posted by ch...@apache.org.
Fixing complex-app undeploy to remove deployment policy and network partition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/571bda5d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/571bda5d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/571bda5d

Branch: refs/heads/master
Commit: 571bda5d5e42679fcb3f9c89134c8f6eb759ac56
Parents: d4c581c
Author: Chamila de Alwis <ch...@apache.org>
Authored: Sat Apr 4 16:38:32 2015 +0530
Committer: Chamila de Alwis <ch...@apache.org>
Committed: Sat Apr 4 23:52:03 2015 +0530

----------------------------------------------------------------------
 samples/applications/complex-app/scripts/common/undeploy.sh | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/571bda5d/samples/applications/complex-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/scripts/common/undeploy.sh b/samples/applications/complex-app/scripts/common/undeploy.sh
index b02bb03..455174f 100644
--- a/samples/applications/complex-app/scripts/common/undeploy.sh
+++ b/samples/applications/complex-app/scripts/common/undeploy.sh
@@ -25,6 +25,12 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://
 echo "Removing autoscale policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
 
+echo "Removing deployment policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
+
+echo "Removing network partitions..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
+
 echo "Removing application policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1