stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lasi...@apache.org
Subject stratos git commit: Removing merge conflicts of few samples
Date Thu, 06 Aug 2015 10:35:07 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 3222a1266 -> 67576a8df


Removing merge conflicts of few samples


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

Branch: refs/heads/master
Commit: 67576a8dfd6c3910b141da70cff1906aa0fd7388
Parents: 3222a12
Author: lasinducharith <lasinducharith@gmail.com>
Authored: Thu Aug 6 16:04:42 2015 +0530
Committer: lasinducharith <lasinducharith@gmail.com>
Committed: Thu Aug 6 16:04:42 2015 +0530

----------------------------------------------------------------------
 .../conf/templates/jndi.properties.template     |  1 -
 samples/cartridges/openstack/php.json           | 25 ++++++++------------
 samples/cartridges/openstack/tomcat.json        | 23 ------------------
 3 files changed, 10 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
index 588d47a..e49750e 100644
--- a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
+++ b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/samples/cartridges/openstack/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/php.json b/samples/cartridges/openstack/php.json
index bc07515..75be00d 100755
--- a/samples/cartridges/openstack/php.json
+++ b/samples/cartridges/openstack/php.json
@@ -1,17 +1,17 @@
 {
-    "type": "php",
-    "provider": "apache",
+    "type": "esb",
+    "provider": "wso2",
     "category": "framework",
-    "host": "php.stratos.org",
-    "displayName": "php",
-    "description": "php Cartridge",
+    "host": "esb.stratos.org",
+    "displayName": "esb",
+    "description": "esb Cartridge",
     "version": "7",
     "multiTenant": "false",
     "portMapping": [
         {
-            "name": "http-80",
+            "name": "http-22",
             "protocol": "http",
-            "port": "8080",
+            "port": "22",
             "proxyPort": "8280"
         }
     ],
@@ -20,25 +20,20 @@
     "iaasProvider": [
         {
             "type": "openstack",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+            "imageId": "RegionOne/a63609be-61df-436f-80bc-d2b6068a4c3a",
             "networkInterfaces": [
                 {
-<<<<<<< HEAD
                     "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-=======
-                    "name": "network-routable",
-                    "networkUuid": "512e1f54-1e85-4dac-b2e6-f0b30fc552cf"
->>>>>>> f5bb41e... Update the INSTALL.md file and samples
                 }
             ],
             "property": [
                 {
                     "name": "instanceType",
-                    "value": "RegionOne/15c3065c-462c-4977-9143-094d63d1c2c7"
+                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
                 },
                 {
                     "name": "keyPair",
-                    "value": "gayan-os"
+                    "value": "vishanth-key"
                 },
                 {
                     "name": "securityGroups",

http://git-wip-us.apache.org/repos/asf/stratos/blob/67576a8d/samples/cartridges/openstack/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/tomcat.json b/samples/cartridges/openstack/tomcat.json
index 94928d5..adc56ca 100755
--- a/samples/cartridges/openstack/tomcat.json
+++ b/samples/cartridges/openstack/tomcat.json
@@ -25,7 +25,6 @@
     "iaasProvider": [
         {
             "type": "openstack",
-<<<<<<< HEAD
             "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff",
             "networkInterfaces": [
                 {
@@ -45,28 +44,6 @@
                     "name": "securityGroups",
                     "value": "default"
                 }
-=======
-            "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff",      
-	    "networkInterfaces":[
-        	    {
-	               "name":"network-non-routable",
-        	       "networkUuid":"b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-	            }
-        	 ],
-	     "property": [
-	    {
-               "name":"instanceType",
-               "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-            },
-            {
-               "name":"keyPair",
-               "value":"gayan-os"
-            },
-            {
-               "name":"securityGroups",
-               "value":"default"
-            }
->>>>>>> f5bb41e... Update the INSTALL.md file and samples
             ]
         }
     ]


Mime
View raw message