This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
     new d31e3ad  fixing dependenct package name collision (#599)
d31e3ad is described below

commit d31e3ad7b7cea80988b3e3303b3fe9e356d3180f
Author: Priti Desai <pde...@us.ibm.com>
AuthorDate: Thu Oct 5 18:03:58 2017 -0700

    fixing dependenct package name collision (#599)
---
 tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml   | 10 +++++-----
 tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml    | 10 +++++-----
 tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml | 10 +++++-----
 tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml  | 10 +++++-----
 tests/src/integration/cloudant/manifest.yaml                   | 10 +++++-----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml 
b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
index 980868c..47c8845 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
@@ -2,7 +2,7 @@
 # Installing openwhisk actions, triggers, and rules for OpenWhisk building 
block - Cloudant Trigger
 
 # Deployment using this manifest file creates following OpenWhisk components:
-#   Package:    openwhisk-cloudant
+#   Package:    node-openwhisk-cloudant
 #   Package:    node-cloudant-trigger
 #   Action:     node-cloudant-trigger/process-change.js
 #   Sequence:   node-cloudant-trigger/process-change-cloudant-sequence
@@ -17,8 +17,8 @@
 packages:
     node-cloudant-trigger:
         dependencies:
-            # binding cloudant package named openwhisk-cloudant
-            openwhisk-cloudant:
+            # binding cloudant package named node-openwhisk-cloudant
+            node-openwhisk-cloudant:
                 location: /whisk.system/cloudant
                 inputs:
                     username: $CLOUDANT_USERNAME
@@ -28,7 +28,7 @@ packages:
             # Trigger named "node-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into 
database
             node-data-inserted-trigger:
-                source: openwhisk-cloudant/changes
+                source: node-openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
         actions:
@@ -41,7 +41,7 @@ packages:
             # Sequence named "process-change-cloudant-sequence"
             # Creating sequence to connect the cloudant "read" action with the 
"process-change" action
             process-change-cloudant-sequence:
-                actions: openwhisk-cloudant/read, process-change
+                actions: node-openwhisk-cloudant/read, process-change
         rules:
             # Rule named "node-log-change-rule"
             # Creating rule that maps database change trigger to sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml 
b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
index 00c6f44..4c91fb7 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
@@ -2,7 +2,7 @@
 # Installing openwhisk actions, triggers, and rules for OpenWhisk building 
block - Cloudant Trigger
 
 # Deployment using this manifest file creates following OpenWhisk components:
-#   Package:    openwhisk-cloudant
+#   Package:    php-openwhisk-cloudant
 #   Package:    php-cloudant-trigger
 #   Action:     php-cloudant-trigger/process-change.js
 #   Sequence:   php-cloudant-trigger/process-change-cloudant-sequence
@@ -17,8 +17,8 @@
 packages:
     php-cloudant-trigger:
         dependencies:
-            # binding cloudant package named openwhisk-cloudant
-            openwhisk-cloudant:
+            # binding cloudant package named php-openwhisk-cloudant
+            php-openwhisk-cloudant:
                 location: /whisk.system/cloudant
                 inputs:
                     username: $CLOUDANT_USERNAME
@@ -28,7 +28,7 @@ packages:
             # Trigger named "php-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into 
database
             php-data-inserted-trigger:
-                source: openwhisk-cloudant/changes
+                source: php-openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
         actions:
@@ -41,7 +41,7 @@ packages:
             # Sequence named "process-change-cloudant-sequence"
             # Creating sequence to connect the cloudant "read" action with the 
"process-change" action
             process-change-cloudant-sequence:
-                actions: openwhisk-cloudant/read, process-change
+                actions: php-openwhisk-cloudant/read, process-change
         rules:
             # Rule named "php-log-change-rule"
             # Creating rule that maps database change trigger to sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml 
b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
index 73cbbf6..bce398a 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
@@ -2,7 +2,7 @@
 # Installing openwhisk actions, triggers, and rules for OpenWhisk building 
block - Cloudant Trigger
 
 # Deployment using this manifest file creates following OpenWhisk components:
-#   Package:    openwhisk-cloudant
+#   Package:    python-openwhisk-cloudant
 #   Package:    python-cloudant-trigger
 #   Action:     python-cloudant-trigger/process-change.js
 #   Sequence:   python-cloudant-trigger/process-change-cloudant-sequence
@@ -17,8 +17,8 @@
 packages:
     python-cloudant-trigger:
         dependencies:
-            # binding cloudant package named openwhisk-cloudant
-            openwhisk-cloudant:
+            # binding cloudant package named python-openwhisk-cloudant
+            python-openwhisk-cloudant:
                 location: /whisk.system/cloudant
                 inputs:
                     username: $CLOUDANT_USERNAME
@@ -28,7 +28,7 @@ packages:
             # Trigger named "python-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into 
database
             python-data-inserted-trigger:
-                source: openwhisk-cloudant/changes
+                source: python-openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
         actions:
@@ -41,7 +41,7 @@ packages:
             # Sequence named "process-change-cloudant-sequence"
             # Creating sequence to connect the cloudant "read" action with the 
"process-change" action
             process-change-cloudant-sequence:
-                actions: openwhisk-cloudant/read, process-change
+                actions: python-openwhisk-cloudant/read, process-change
         rules:
             # Rule named "python-log-change-rule"
             # Creating rule that maps database change trigger to sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml 
b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
index 4511a9b..34ee862 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
@@ -2,7 +2,7 @@
 # Installing openwhisk actions, triggers, and rules for OpenWhisk building 
block - Cloudant Trigger
 
 # Deployment using this manifest file creates following OpenWhisk components:
-#   Package:    openwhisk-cloudant
+#   Package:    swift-openwhisk-cloudant
 #   Package:    swift-cloudant-trigger
 #   Action:     swift-cloudant-trigger/process-change.js
 #   Sequence:   swift-cloudant-trigger/process-change-cloudant-sequence
@@ -17,8 +17,8 @@
 packages:
     swift-cloudant-trigger:
         dependencies:
-            # binding cloudant package named openwhisk-cloudant
-            openwhisk-cloudant:
+            # binding cloudant package named swift-openwhisk-cloudant
+            swift-openwhisk-cloudant:
                 location: /whisk.system/cloudant
                 inputs:
                     username: $CLOUDANT_USERNAME
@@ -28,7 +28,7 @@ packages:
             # Trigger named "swift-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into 
database
             swift-data-inserted-trigger:
-                source: openwhisk-cloudant/changes
+                source: swift-openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
         actions:
@@ -41,7 +41,7 @@ packages:
             # Sequence named "process-change-cloudant-sequence"
             # Creating sequence to connect the cloudant "read" action with the 
"process-change" action
             process-change-cloudant-sequence:
-                actions: openwhisk-cloudant/read, process-change
+                actions: swift-openwhisk-cloudant/read, process-change
         rules:
             # Rule named "swift-log-change-rule"
             # Creating rule that maps database change trigger to sequence
diff --git a/tests/src/integration/cloudant/manifest.yaml 
b/tests/src/integration/cloudant/manifest.yaml
index bb3c83d..0d22e58 100644
--- a/tests/src/integration/cloudant/manifest.yaml
+++ b/tests/src/integration/cloudant/manifest.yaml
@@ -1,6 +1,6 @@
 # Deployment using this manifest file creates following OpenWhisk components:
 #   Package:    cloudant-sample
-#   Package:    openwhisk-cloudant
+#   Package:    sample-openwhisk-cloudant
 #   Action:     cloudant-sample/process-change
 #   Sequence:   cloudant-sample/process-change-cloudant-sequence
 #   Trigger:    sample-data-inserted-trigger
@@ -14,8 +14,8 @@
 packages:
     cloudant-sample:
         dependencies:
-            # binding cloudant package named openwhisk-cloudant
-            openwhisk-cloudant:
+            # binding cloudant package named sample-openwhisk-cloudant
+            sample-openwhisk-cloudant:
                 location: /whisk.system/cloudant
                 inputs:
                     username: $CLOUDANT_USERNAME
@@ -25,7 +25,7 @@ packages:
             # Trigger named "sample-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into 
database
             sample-data-inserted-trigger:
-                source: openwhisk-cloudant/changes
+                source: sample-openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
         actions:
@@ -38,7 +38,7 @@ packages:
             # Sequence named "process-change-cloudant-sequence"
             # Creating sequence to connect the cloudant "read" action with the 
"process-change" action
             process-change-cloudant-sequence:
-                actions: openwhisk-cloudant/read, process-change
+                actions: sample-openwhisk-cloudant/read, process-change
         rules:
             # Rule named "sample-log-change-rule"
             # Creating rule that maps database change trigger to sequence

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Reply via email to