You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/16 11:01:36 UTC

[1/2] git commit: Using jclouds 1.6.2-incubating

Updated Branches:
  refs/heads/master d48fa396f -> bf3895f8b


Using jclouds 1.6.2-incubating


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

Branch: refs/heads/master
Commit: e64a8fafdf59724b509af83eabbde17a24f9d2d6
Parents: e723041
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Thu Jan 16 15:30:41 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Thu Jan 16 15:30:41 2014 +0530

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e64a8faf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e038c9c..c8179ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,6 +432,6 @@
         <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range>
         <carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version>
         <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version>
-        <jclouds.version>1.6.3</jclouds.version>
+        <jclouds.version>1.6.2-incubating</jclouds.version>
     </properties>
 </project>


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by is...@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/bf3895f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bf3895f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bf3895f8

Branch: refs/heads/master
Commit: bf3895f8b75f4fc9757368d8810896906e37815f
Parents: e64a8fa d48fa39
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Thu Jan 16 15:31:20 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Thu Jan 16 15:31:20 2014 +0530

----------------------------------------------------------------------
 .../console/configure_stratos_wizard.jag        |   28 +
 .../console/console.ipr                         |   59 +
 .../console/console.iws                         |  719 ++++++
 .../console/data/config_status.json             |    2 +-
 .../console/data/tenants.json                   |   19 +
 .../console/tenant_management.jag               |   11 +
 .../console/tenant_new.jag                      |   11 +
 .../partials/configure_stratos_wizard.hbs       |   87 +
 .../console/themes/theme1/partials/header.hbs   |  212 +-
 .../themes/theme1/partials/mycartridges.hbs     |   30 +
 .../theme1/partials/tenant_management.hbs       |   92 +
 .../themes/theme1/partials/tenant_new.hbs       |   67 +
 .../renderers/configure_stratos_wizard.js       |   75 +
 .../console/themes/theme1/renderers/index.js    |   66 +-
 .../theme1/renderers/tenant_management.js       |   42 +
 .../themes/theme1/renderers/tenant_new.js       |   42 +
 .../console/themes/theme1/theme.js              |   37 +-
 .../console/themes/theme1/ui/css/bootstrap.css  | 2337 ++++++++++--------
 .../console/themes/theme1/ui/css/main.css       |  116 +-
 .../themes/theme1/ui/js/tenant_management.js    |   30 +
 .../console/themes/theme1/ui/js/wizard.js       |   18 +
 21 files changed, 3007 insertions(+), 1093 deletions(-)
----------------------------------------------------------------------