[1/3] brooklyn-docs git commit: Adds “enricher” to the glossary

[aledsage]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master b8a5ca566 -> 3dfa639ca


Adds “enricher” to the glossary

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/54b00bf8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/54b00bf8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/54b00bf8

Branch: refs/heads/master
Commit: 54b00bf8a1f7c1b0df345b991c68b451ceec8900
Parents: af1220f
Author: Aled Sage 
Authored: Wed Feb 3 16:26:44 2016 +
Committer: Aled Sage 
Committed: Wed Feb 3 16:26:59 2016 +

--
 website/documentation/glossary.md | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/54b00bf8/website/documentation/glossary.md
--
diff --git a/website/documentation/glossary.md 
b/website/documentation/glossary.md
index 0651068..6846d23 100644
--- a/website/documentation/glossary.md
+++ b/website/documentation/glossary.md
@@ -44,6 +44,12 @@ be described in [YAML][].
 An operation on an [entity][].
 
 
+ Enricher
+
+Generates new events or [sensor][] values (metrics) for an entity, usually by 
aggregating 
+or modifying data from one or more other sensors.
+
+
  Entity
 
 A component of an application or system. This could be a physical component, a
@@ -71,10 +77,10 @@ A human-readable data format.
 * [Wikipedia article](http://en.wikipedia.org/wiki/YAML) on YAML
 
 
- Apache Jclouds
+ Apache jclouds
 
 An open source Java library that provides a consistent interface to many
-clouds. Apache Brooklyn uses Apache Jclouds as its core cloud abstraction.
+clouds. Apache Brooklyn uses Apache jclouds as its core cloud abstraction.
 
 ## See also
 * [Project homepage](https://jclouds.apache.org/)

[3/3] brooklyn-docs git commit: This closes #5

[aledsage]

This closes #5


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/3dfa639c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/3dfa639c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/3dfa639c

Branch: refs/heads/master
Commit: 3dfa639ca16d705f17cbd55ae4048227259a4638
Parents: b8a5ca5 54b00bf
Author: Aled Sage 
Authored: Wed Feb 3 16:27:29 2016 +
Committer: Aled Sage 
Committed: Wed Feb 3 16:27:29 2016 +

--
 guide/start/example_yaml/mycluster.yaml |  59 
 guide/start/policies.md | 497 +--
 website/documentation/glossary.md   |  10 +-
 3 files changed, 450 insertions(+), 116 deletions(-)
--

[2/3] brooklyn-docs git commit: Changed wording

[aledsage]

Changed wording


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

Branch: refs/heads/master
Commit: f9594c3e7731ef190120effca66edcaa30c2e92d
Parents: cd5628b
Author: Duncan Godwin 
Authored: Wed Feb 3 12:02:23 2016 +
Committer: Duncan Godwin 
Committed: Wed Feb 3 12:02:23 2016 +

--
 guide/start/running.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/f9594c3e/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index 636887b..2e5b650 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -23,7 +23,7 @@ Two methods of deployment are detailed in this tutorial, 
using virtualisation wi
 
 
 
-[Vagrant](https://www.vagrantup.com/){:target="_blank"} is a software package 
which automates the process of setting up virtual environments such as [Oracle 
VirtualBox](https://www.virtualbox.org){:target="_blank"}. We recommend it as
+[Vagrant](https://www.vagrantup.com/){:target="_blank"} is a software package 
which automates the process of setting up virtual machines (VM) such as [Oracle 
VirtualBox](https://www.virtualbox.org){:target="_blank"}. We recommend it as
 the easiest way of getting started with Apache Brooklyn.
 
 Firstly, download and install:
@@ -31,7 +31,7 @@ Firstly, download and install:
  * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
  * [Oracle 
VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
  
-Then download the default Apache Brooklyn vagrant configuration from 
[here](https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}.
 This configuration contains everything you need to get started using Apache 
Brooklyn.
+Then download the provided Apache Brooklyn vagrant configuration from 
[here](https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}.
 This archive contains everything you need to create an environment for use 
with this guide, providing an Apache Brooklyn instance and some blank VMs.
 
 Extract the `tar.gz` archive and navigate into the expanded 
`apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
 

[1/3] brooklyn-docs git commit: Corrections to Getting Started & Vagrant URL

[aledsage]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 3dfa639ca -> ea07b78d6


Corrections to Getting Started & Vagrant URL


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

Branch: refs/heads/master
Commit: cd5628b37abc19b8ba23bc520102a424c8c2e9a6
Parents: 1ff8161
Author: Duncan Godwin 
Authored: Wed Feb 3 11:41:08 2016 +
Committer: Duncan Godwin 
Committed: Wed Feb 3 11:41:08 2016 +

--
 _includes/base-head.html | 8 +---
 guide/start/running.md   | 8 
 2 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cd5628b3/_includes/base-head.html
--
diff --git a/_includes/base-head.html b/_includes/base-head.html
index 3f79d02..18c2c6f 100644
--- a/_includes/base-head.html
+++ b/_includes/base-head.html
@@ -7,17 +7,18 @@
 
 
 
-
 
 
 
 
 
 
-
 
-
 
+{% if page.url contains "/start/" %}
+
+
+
 
 $(function(){
   $('body').glossarizer({
@@ -28,3 +29,4 @@ $(function(){
   });
 });
 
+{% endif %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cd5628b3/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index 5da792c..636887b 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -31,13 +31,13 @@ Firstly, download and install:
  * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
  * [Oracle 
VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
  
-Then download the default Apache Brooklyn vagrant configuration from 
[here](https://github.com/johnmccabe/vagrant-brooklyn-getting-started/archive/master.tar.gz){:target="_blank"}.
 This configuration contains everything you need to get started using Apache 
Brooklyn.
+Then download the default Apache Brooklyn vagrant configuration from 
[here](https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}.
 This configuration contains everything you need to get started using Apache 
Brooklyn.
 
-Extract the `tar.gz` archive and navigate into the expanded 
`vagrant-brooklyn-getting-started-master` folder
+Extract the `tar.gz` archive and navigate into the expanded 
`apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
 
 {% highlight bash %}
-$ tar xvf master.tar.gz
-$ cd vagrant-brooklyn-getting-started-master
+$ tar xvf apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz
+$ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
 {% endhighlight %}
 
 

[3/3] brooklyn-docs git commit: This closes #7

[aledsage]

This closes #7


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

Branch: refs/heads/master
Commit: ea07b78d6456469147a162b29005dce246d32e9a
Parents: 3dfa639 f9594c3
Author: Aled Sage 
Authored: Wed Feb 3 16:43:33 2016 +
Committer: Aled Sage 
Committed: Wed Feb 3 16:43:33 2016 +

--
 _includes/base-head.html |  8 +---
 guide/start/running.md   | 10 +-
 2 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ea07b78d/guide/start/running.md
--
diff --cc guide/start/running.md
index 5871c4d,2e5b650..ed78028
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@@ -28,16 -28,16 +28,16 @@@ the easiest way of getting started wit
  
  Firstly, download and install:
  
 - * [Vagrant](http://www.vagrantup.com/downloads){:target="_blank"}
 + * [Vagrant](https://www.vagrantup.com/downloads.html){:target="_blank"}
   * [Oracle 
VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
   
- Then download the default Apache Brooklyn vagrant configuration from 
[here](https://github.com/johnmccabe/vagrant-brooklyn-getting-started/archive/master.tar.gz){:target="_blank"}.
 This configuration contains everything you need to get started using Apache 
Brooklyn.
+ Then download the provided Apache Brooklyn vagrant configuration from 
[here](https://www.apache.org/dyn/closer.lua?action=download=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}.
 This archive contains everything you need to create an environment for use 
with this guide, providing an Apache Brooklyn instance and some blank VMs.
  
- Extract the `tar.gz` archive and navigate into the expanded 
`vagrant-brooklyn-getting-started-master` folder
+ Extract the `tar.gz` archive and navigate into the expanded 
`apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
  
  {% highlight bash %}
- $ tar xvf master.tar.gz
- $ cd vagrant-brooklyn-getting-started-master
+ $ tar xvf apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz
+ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
  {% endhighlight %}
  
  

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

[grkvlt]

This closes #2

* upstream/pr/2:
  remove ATTENTION folder


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/90eb128b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/90eb128b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/90eb128b

Branch: refs/heads/master
Commit: 90eb128ba4147ce08b137ce5e82369c510c77cf9
Parents: d03f254 2157b75
Author: Andrew Donald Kennedy 
Authored: Wed Feb 3 17:48:01 2016 +
Committer: Andrew Donald Kennedy 
Committed: Wed Feb 3 17:48:01 2016 +

--
 ATTENTION/README.md | 39 ---
 1 file changed, 39 deletions(-)
--