You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/21 15:18:33 UTC
[1/3] git commit: fixing ip retrieval - get the IP if and only if
there's no assigned IP
Repository: incubator-stratos
Updated Branches:
refs/heads/master 4be49892f -> c578a5095
fixing ip retrieval - get the IP if and only if there's no assigned IP
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fe9c0249
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fe9c0249
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fe9c0249
Branch: refs/heads/master
Commit: fe9c0249ba8eb8529ba1fc45cfe993e3684bda81
Parents: e2c5957
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 21 19:46:11 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 21 19:46:11 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fe9c0249/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
index 7378776..0241a62 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
@@ -236,8 +236,7 @@ public class OpenstackNovaIaas extends Iaas {
@Override
public boolean apply(FloatingIP arg0) {
- // FIXME is this the correct filter?
- return arg0.getFixedIp() == null;
+ return arg0.getInstanceId() == null;
}
}));
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/c578a509
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c578a509
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c578a509
Branch: refs/heads/master
Commit: c578a5095122281f085cdfe5f52e71b2200c99d4
Parents: 5ff37bc 4be4989
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 21 19:47:38 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 21 19:47:38 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme1/pages/index.hbs | 11 +-
.../console/themes/theme1/pages/plain.hbs | 2 +-
.../console/themes/theme1/partials/login.hbs | 4 +-
.../themes/theme1/ui/Open_Sans/LICENSE.txt | 202 +++++
.../theme1/ui/Open_Sans/OpenSans-Bold.ttf | Bin 0 -> 224592 bytes
.../theme1/ui/Open_Sans/OpenSans-BoldItalic.ttf | Bin 0 -> 213292 bytes
.../theme1/ui/Open_Sans/OpenSans-ExtraBold.ttf | Bin 0 -> 222584 bytes
.../ui/Open_Sans/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 213420 bytes
.../theme1/ui/Open_Sans/OpenSans-Italic.ttf | Bin 0 -> 212896 bytes
.../theme1/ui/Open_Sans/OpenSans-Light.ttf | Bin 0 -> 222412 bytes
.../ui/Open_Sans/OpenSans-LightItalic.ttf | Bin 0 -> 213128 bytes
.../theme1/ui/Open_Sans/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes
.../theme1/ui/Open_Sans/OpenSans-Semibold.ttf | Bin 0 -> 221328 bytes
.../ui/Open_Sans/OpenSans-SemiboldItalic.ttf | Bin 0 -> 212820 bytes
.../themes/theme1/ui/Open_Sans/open_sans.css | 18 +
.../theme1/ui/custom-font-new/LICENSE.txt | 12 +
.../themes/theme1/ui/custom-font-new/README.txt | 75 ++
.../theme1/ui/custom-font-new/config.json | 740 +++++++++++++++++++
.../theme1/ui/custom-font-new/css/animation.css | 85 +++
.../ui/custom-font-new/css/fontello-codes.css | 112 +++
.../custom-font-new/css/fontello-embedded.css | 165 +++++
.../custom-font-new/css/fontello-ie7-codes.css | 112 +++
.../ui/custom-font-new/css/fontello-ie7.css | 123 +++
.../theme1/ui/custom-font-new/css/fontello.css | 163 ++++
.../themes/theme1/ui/custom-font-new/demo.html | 433 +++++++++++
.../theme1/ui/custom-font-new/font/fontello.eot | Bin 0 -> 30296 bytes
.../theme1/ui/custom-font-new/font/fontello.svg | 122 +++
.../theme1/ui/custom-font-new/font/fontello.ttf | Bin 0 -> 30128 bytes
.../ui/custom-font-new/font/fontello.woff | Bin 0 -> 22732 bytes
29 files changed, 2373 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: disabling cassandra server start up
Posted by ni...@apache.org.
disabling cassandra server start up
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5ff37bc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5ff37bc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5ff37bc8
Branch: refs/heads/master
Commit: 5ff37bc89d061b8f325d6dec0edc5d0937f664eb
Parents: fe9c024
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 21 19:46:52 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 21 19:46:52 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/distribution/src/bin/stratos.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5ff37bc8/products/stratos/modules/distribution/src/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/bin/stratos.sh b/products/stratos/modules/distribution/src/bin/stratos.sh
index 77f7a91..eda3730 100755
--- a/products/stratos/modules/distribution/src/bin/stratos.sh
+++ b/products/stratos/modules/distribution/src/bin/stratos.sh
@@ -298,6 +298,7 @@ do
-Dorg.terracotta.quartz.skipUpdateCheck=true \
-Djava.security.egd=file:/dev/./urandom \
-Dfile.encoding=UTF8 \
+ -Ddisable.cassandra.server.startup=true \
-Djndi.properties.dir="$CARBON_HOME/repository/conf" \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?