[1/2] incubator-brooklyn git commit: Adds catalog item example to externalized-configuration.md

2016-01-22 Thread aledsage
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master b28ba027e -> 80f7f6216


Adds catalog item example to externalized-configuration.md


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

Branch: refs/heads/master
Commit: 76c761b19fe43f204bcf215315b97e8411a3cba1
Parents: b28ba02
Author: Aled Sage 
Authored: Fri Jan 22 15:03:41 2016 +
Committer: Aled Sage 
Committed: Fri Jan 22 17:52:20 2016 +

--
 .../guide/ops/externalized-configuration.md| 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/76c761b1/brooklyn-docs/guide/ops/externalized-configuration.md
--
diff --git a/brooklyn-docs/guide/ops/externalized-configuration.md 
b/brooklyn-docs/guide/ops/externalized-configuration.md
index ea6c63c..24fd4eb 100644
--- a/brooklyn-docs/guide/ops/externalized-configuration.md
+++ b/brooklyn-docs/guide/ops/externalized-configuration.md
@@ -122,6 +122,23 @@ 
brooklyn.location.jclouds.aws-ec2.credential=$brooklyn:external("mysupplier", "a
 {% endhighlight %}
 
 
+## Referring to External Configuration in Catalog Items
+
+The same blueprint language DSL can be used within YAML catalog items. For 
example:
+
+brooklyn.catalog:
+  id: com.example.myblueprint
+  version: 1.2.3
+  brooklyn.libraries:
+  - >
+
$brooklyn:formatString("https://%s:%s...@repo.example.com/libs/myblueprint-1.2.3.jar";,
 
+external("mysuppier", "username"), external("mysupplier", "password"))
+  item:
+type: com.example.MyBlueprint
+
+Note the `>` in the example above is used to split across multiple lines.
+
+
 ## Suppliers available with Brooklyn
 
 Brooklyn ships with a number of external configuration suppliers ready to use.



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

2016-01-22 Thread aledsage
This closes #1172


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

Branch: refs/heads/master
Commit: 80f7f62162e024817e0754677fbcc3124ec56ed7
Parents: b28ba02 76c761b
Author: Aled Sage 
Authored: Fri Jan 22 17:53:45 2016 +
Committer: Aled Sage 
Committed: Fri Jan 22 17:53:45 2016 +

--
 .../guide/ops/externalized-configuration.md| 17 +
 1 file changed, 17 insertions(+)
--