csantanapr closed pull request #3910: Allow non-json skip_pull_runtimes to be
passed as True.
URL: https://github.com/apache/incubator-openwhisk/pull/3910
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/roles/invoker/tasks/deploy.yml
b/ansible/roles/invoker/tasks/deploy.yml
index 40b4b7cb94..f214fd03b8 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -28,7 +28,7 @@
- name: "pull runtime action images per manifest"
shell: "docker pull {{runtimes_registry |
default()}}{{item.prefix}}/{{item.name}}:{{item.tag | default()}}"
loop: "{{ runtimesManifest.runtimes.values() | sum(start=[]) |
selectattr('deprecated', 'equalto',false) | map(attribute='image') | list |
unique }}"
- when: skip_pull_runtimes is not defined or skip_pull_runtimes != True
+ when: skip_pull_runtimes is not defined or not (skip_pull_runtimes == True
or skip_pull_runtimes.lower() == "true")
register: result
until: (result.rc == 0)
retries: "{{ docker.pull.retries }}"
@@ -40,7 +40,7 @@
- name: "pull blackboxes action images per manifest"
shell: "docker pull {{runtimes_registry |
default()}}{{item.prefix}}/{{item.name}}:{{item.tag | default()}}"
loop: "{{ runtimesManifest.blackboxes }}"
- when: skip_pull_runtimes is not defined or skip_pull_runtimes != True
+ when: skip_pull_runtimes is not defined or not (skip_pull_runtimes == True
or skip_pull_runtimes.lower() == "true")
register: result
until: (result.rc == 0)
retries: "{{ docker.pull.retries }}"
diff --git a/docs/actions-ruby.md b/docs/actions-ruby.md
index 540592a723..0eb45b1a52 100644
--- a/docs/actions-ruby.md
+++ b/docs/actions-ruby.md
@@ -34,7 +34,7 @@ with the following source code:
def main(args)
name = args["name"] || "stranger"
greeting = "Hello #{name}!"
- print greeting
+ puts greeting
{ "greeting" => greeting }
end
```
diff --git a/tests/src/test/resources/application.conf.j2
b/tests/src/test/resources/application.conf.j2
index 3b75461d28..c1cec8c4cd 100644
--- a/tests/src/test/resources/application.conf.j2
+++ b/tests/src/test/resources/application.conf.j2
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
whisk.spi {
SimpleSpi = whisk.spi.SimpleSpiImpl
MissingSpi = whisk.spi.MissingImpl
diff --git a/tools/travis/README.md b/tools/travis/README.md
index fd5e5544f6..8d0fbad958 100644
--- a/tools/travis/README.md
+++ b/tools/travis/README.md
@@ -33,4 +33,4 @@ These jobs make use of following scripts
4. `setupSystem.sh` - Runs the various containers which are part of an
OpenWhisk setup like Controller, Invoker etc.
5. `runTests.sh` - Runs the tests. It make use of
`ORG_GRADLE_PROJECT_testSetName` env setting to determine which test
suite to run.
-6. `checkAndUploadLogs.sh` - Collect the logs, check them and then upload
them https://app.box.com/v/openwhisk-travis-logs
+6. `checkAndUploadLogs.sh` - Collects the logs, checks them and uploads them
to https://openwhisk.box.com/v/travis-logs.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
