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 2013/08/12 04:51:52 UTC

[1/2] git commit: Updated product versions in filter.properties

Updated Branches:
  refs/heads/master a08913fad -> f6d67a2c5


Updated product versions in filter.properties


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

Branch: refs/heads/master
Commit: 81ff0602a4df977bff5a04cdba3339c250a5ee9d
Parents: 6f2c5ce
Author: Isuru Perera <is...@apache.org>
Authored: Sun Aug 11 08:46:17 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Sun Aug 11 08:46:17 2013 +0530

----------------------------------------------------------------------
 .../src/main/assembly/filter.properties         | 21 +++++++++++++++++++-
 .../src/main/assembly/filter.properties         | 21 +++++++++++++++++++-
 .../src/main/assembly/filter.properties         |  2 +-
 3 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/81ff0602/products/cloud-controller/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/filter.properties b/products/cloud-controller/modules/distribution/src/main/assembly/filter.properties
index 1d2a3aa..37cea51 100644
--- a/products/cloud-controller/modules/distribution/src/main/assembly/filter.properties
+++ b/products/cloud-controller/modules/distribution/src/main/assembly/filter.properties
@@ -1,4 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 product.name=Apache Stratos Cloud Controller
 product.key=CC
-product.version=1.0.0
+product.version=3.0.0-SNAPSHOT
 carbon.version=4.1.1

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/81ff0602/products/elb/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/filter.properties b/products/elb/modules/distribution/src/main/assembly/filter.properties
index bcda18d..8abf06d 100644
--- a/products/elb/modules/distribution/src/main/assembly/filter.properties
+++ b/products/elb/modules/distribution/src/main/assembly/filter.properties
@@ -1,6 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 product.name=Apache Stratos ELB
 product.key=ELB
-product.version=2.0.5
+product.version=3.0.0-SNAPSHOT
 
 lb.version=2.0.5
 default.server.role=ElasticLoadBalancer

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/81ff0602/products/stratos-agent/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos-agent/modules/distribution/src/main/assembly/filter.properties b/products/stratos-agent/modules/distribution/src/main/assembly/filter.properties
index f10f62d..cc916ce 100644
--- a/products/stratos-agent/modules/distribution/src/main/assembly/filter.properties
+++ b/products/stratos-agent/modules/distribution/src/main/assembly/filter.properties
@@ -19,7 +19,7 @@
 
 product.name=Apache Stratos Agent
 product.key=Agent
-product.version=1.0.0
+product.version=3.0.0-SNAPSHOT
 
 carbon.version=4.1.1
 lb.version=1.0.0


[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/f6d67a2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6d67a2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6d67a2c

Branch: refs/heads/master
Commit: f6d67a2c5423596fef0ccec1ee3835dd47d6f1a6
Parents: 81ff060 a08913f
Author: Isuru Perera <is...@apache.org>
Authored: Mon Aug 12 08:21:38 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Mon Aug 12 08:21:38 2013 +0530

----------------------------------------------------------------------
 products/cloud-controller/LICENSE.txt           | 1102 ++++++++++--------
 products/cloud-controller/NOTICE                |    5 +
 .../src/main/conf/loadbalancer.conf             |   64 +-
 .../init_scripts/tomcat/stratos.pem             |   16 -
 .../init_scripts/tomcat/wso2.pem                |   16 +
 tools/ec2-demo-setup/config.sh                  |    5 +-
 tools/ec2-demo-setup/tempconfigs/nodes.pp       |  465 --------
 7 files changed, 632 insertions(+), 1041 deletions(-)
----------------------------------------------------------------------