You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/12/29 16:54:43 UTC

[1/2] incubator-brooklyn git commit: Update for using a file for complex / multi-line invoke parameter values.

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master cd504e226 -> 55fcdf9be


Update for using a file for complex / multi-line invoke parameter values.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29bc6f63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29bc6f63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29bc6f63

Branch: refs/heads/master
Commit: 29bc6f6324cad0b640bad24ec67c2da2a5172961
Parents: cd504e2
Author: lloyddave <da...@lloyds.org.uk>
Authored: Wed Dec 23 19:10:17 2015 +0000
Committer: lloyddave <da...@lloyds.org.uk>
Committed: Wed Dec 23 19:10:17 2015 +0000

----------------------------------------------------------------------
 brooklyn-docs/guide/ops/cli/cli-ref-guide.md   | 5 ++++-
 brooklyn-docs/guide/ops/cli/cli-usage-guide.md | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29bc6f63/brooklyn-docs/guide/ops/cli/cli-ref-guide.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/guide/ops/cli/cli-ref-guide.md b/brooklyn-docs/guide/ops/cli/cli-ref-guide.md
index f9c752c..9a7ebfd 100644
--- a/brooklyn-docs/guide/ops/cli/cli-ref-guide.md
+++ b/brooklyn-docs/guide/ops/cli/cli-ref-guide.md
@@ -228,7 +228,10 @@ policy       pol
   Invoke the effector without any parameters.
 
 - `br <entity-scope> effector <EffectorID> invoke [<param>=<value> ...]`  
-  Invoke the effector with one of more parameters.
+  Invoke the effector with one of more parameters.  
+  If the parameter value is
+  complex or multi-lined it may be provided in a file and referenced as:  
+  `<param>=@<FILE>`
 
 **NOTE** Shortcut commands have been provided for the standard start, restart and stop effectors.  For example:  
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29bc6f63/brooklyn-docs/guide/ops/cli/cli-usage-guide.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/guide/ops/cli/cli-usage-guide.md b/brooklyn-docs/guide/ops/cli/cli-usage-guide.md
index bf2f310..c8edf0d 100644
--- a/brooklyn-docs/guide/ops/cli/cli-usage-guide.md
+++ b/brooklyn-docs/guide/ops/cli/cli-usage-guide.md
@@ -261,6 +261,12 @@ Parameters can also be passed to the effector:
 $ br app WebCluster entity NginxController:CZ8Q effector restart invoke restartChildren=true
 {% endhighlight %}
 
+If a parameter value is complex or spans multiple lines, it may be provided in a file and used like this:
+
+{% highlight text %}
+$ br app WebCluster effector start invoke locations=@data.txt
+{% endhighlight %}
+
 Shortcut commands are available for the 3 standard effectors of `start`, `restart` and `stop`.
 These commands can be used directly with an app-scope or entity-scope:
 


[2/2] incubator-brooklyn git commit: This closes #1122

Posted by al...@apache.org.
This closes #1122


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/55fcdf9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/55fcdf9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/55fcdf9b

Branch: refs/heads/master
Commit: 55fcdf9be5d517125e11123d6a74e2eb4dc49e6b
Parents: cd504e2 29bc6f6
Author: Aled Sage <al...@gmail.com>
Authored: Tue Dec 29 15:54:13 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Dec 29 15:54:13 2015 +0000

----------------------------------------------------------------------
 brooklyn-docs/guide/ops/cli/cli-ref-guide.md   | 5 ++++-
 brooklyn-docs/guide/ops/cli/cli-usage-guide.md | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------