You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/05/19 15:31:06 UTC
[GitHub] jthomas closed pull request #125: typo in readme & Makefile
jthomas closed pull request #125: typo in readme & Makefile
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/125
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/docker-compose/Makefile b/docker-compose/Makefile
index 25c80fe..edb55d6 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -296,7 +296,7 @@ hello-world: create-hello-world-function
echo "$$(tput setaf 4)invoking the function ...$$(tput sgr0)"
res=`$(WSK_CLI) -i action invoke hello --blocking --result` \
- && echo "invokation result:" $$res \
+ && echo "invocation result:" $$res \
&& (echo $$res | grep "Hello, World") || ($(WSK_CLI) -i action delete hello && tail -n 200 ~/tmp/openwhisk/invoker/logs/invoker-local_logs.log ~/tmp/openwhisk/controller/logs/controller-local_logs.log && exit 1)
echo "$$(tput setaf 4) creating an API from the hello function ...$$(tput sgr0)"
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 6ca4866..6b7a179 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -136,7 +136,7 @@ function main(params) {
return {payload: "Hello, " + name + "!"};
}
```
-The result of the invokation should be printed on the terminal:
+The result of the invocation should be printed on the terminal:
```
{
"payload": "Hello, World!"
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services