You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/04/20 19:02:26 UTC
[1/4] brooklyn-docs git commit: Corrected brooklyn references
Repository: brooklyn-docs
Updated Branches:
refs/heads/master ffc3ee63d -> 0de526b9d
Corrected brooklyn references
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e70716eb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e70716eb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e70716eb
Branch: refs/heads/master
Commit: e70716eb8da0151ca80350ae15bf52589e095ee6
Parents: 6f8c37b
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Mon Apr 4 16:27:25 2016 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Mon Apr 4 16:27:25 2016 +0100
----------------------------------------------------------------------
guide/ops/locations/clouds.md | 2 +-
guide/ops/persistence/index.md | 2 +-
guide/start/running.md | 2 +-
guide/yaml/chef/about-chef.md | 4 ++--
website/documentation/increase-entropy.md | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e70716eb/guide/ops/locations/clouds.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/clouds.md b/guide/ops/locations/clouds.md
index 08109e0..89195fa 100644
--- a/guide/ops/locations/clouds.md
+++ b/guide/ops/locations/clouds.md
@@ -59,7 +59,7 @@ Brooklyn to use specific credentials for the initial login to a cloud-provisione
(This custom login is particularly useful when using a custom image templates where the cloud-side account
management logic is not enabled. For example, a vCloud (vCD) template can have guest customization that will change
-the root password. This setting tells AMP to only use the given password, rather than the initial
+the root password. This setting tells Apache Brooklyn to only use the given password, rather than the initial
randomly generated password that vCD returns. Without this property, there is a race for such templates:
does Brooklyn manage to create the admin user before the guest customization changes the login and reboots,
or is the password reset first (the latter means Brooklyn can never ssh to the VM). With this property,
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e70716eb/guide/ops/persistence/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md
index 58b5915..30c3d5f 100644
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@ -367,7 +367,7 @@ An example script to be invoked by CRON is shown below:
BACKUP_FILENAME=/path/to/archives/back-${DATE}.tar.gz
TEMP_DATA_DIR=/path/to/tempdir
- amp copy-state \
+ brooklyn copy-state \
--persistenceLocation named:my-persistence-location \
--persistenceDir /path/to/bucket \
--destinationDir $TEMP_DATA_DIR
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e70716eb/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 0518743..3464023 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -55,7 +55,7 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
For Centos 7 and RHEL 7 users, the recommended way to install Apache Brooklyn on RPM-based Linux distributions is by using the RPM package.
-RPM is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The AMP package contains all the necessary files associated with the Apache Brooklyn application.
+RPM is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The RPM package contains all the necessary files associated with the Apache Brooklyn application.
Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"}.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e70716eb/guide/yaml/chef/about-chef.md
----------------------------------------------------------------------
diff --git a/guide/yaml/chef/about-chef.md b/guide/yaml/chef/about-chef.md
index db3ec3c..8f87d07 100644
--- a/guide/yaml/chef/about-chef.md
+++ b/guide/yaml/chef/about-chef.md
@@ -38,13 +38,13 @@ the server. This is not the case - the bootstrap operation does not involve `kni
itself to the server, passing on its configuration.
This diagram summarises the interaction between Brooklyn, the new node, and the various Chef tools. Note that there
-is no interaction between the AMP Server and the Chef Server.
+is no interaction between the Apache Brooklyn Server and the Chef Server.
[](chef-call-flow.png)
### How Brooklyn interacts with Chef
Brooklyn understands both the *server* and *solo* modes of operation. Server mode utilises the `knife` toolkit, and
-therefore `knife` must be installed onto the AMP server and configured appropriately. Solo mode does not have any
+therefore `knife` must be installed onto the Apache Brooklyn server and configured appropriately. Solo mode does not have any
special requirements; when running in solo mode, Brooklyn will install and configure the Chef client over SSH, just
like it does most other kinds of entities.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e70716eb/website/documentation/increase-entropy.md
----------------------------------------------------------------------
diff --git a/website/documentation/increase-entropy.md b/website/documentation/increase-entropy.md
index 53d5768..c269f32 100644
--- a/website/documentation/increase-entropy.md
+++ b/website/documentation/increase-entropy.md
@@ -2,7 +2,7 @@
title: Increase Entropy
layout: website-normal
---
-If you are installing AMP on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`.
+If you are installing Apache Brooklyn on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`.
### Installing rng-tool
if you are using a RHEL-based OS:
[2/4] brooklyn-docs git commit: Typos
Posted by sj...@apache.org.
Typos
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/24371929
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/24371929
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/24371929
Branch: refs/heads/master
Commit: 243719295311a80c78a8faa88d58cfa69b9e9faa
Parents: ffc3ee6
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Apr 20 17:54:24 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Apr 20 17:54:24 2016 +0100
----------------------------------------------------------------------
contributing/inline-children.md | 4 ++--
guide/ops/locations/index.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/24371929/contributing/inline-children.md
----------------------------------------------------------------------
diff --git a/contributing/inline-children.md b/contributing/inline-children.md
index 08eaa38..480f451 100644
--- a/contributing/inline-children.md
+++ b/contributing/inline-children.md
@@ -48,7 +48,7 @@ Brooklyn supports a wide range of locations:
Configuration can be set in `~/.brooklyn/brooklyn.properties`
or directly in YAML when specifying a location.
-On some entities, config keys determining maching selection and provisioning behavior
-can also be set `in `provisioning.properties`.
+On some entities, config keys determining matching selection and provisioning behavior
+can also be set in `provisioning.properties`.
{% child_content %}</pre>
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/24371929/guide/ops/locations/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/index.md b/guide/ops/locations/index.md
index 8b74698..fbcf35f 100644
--- a/guide/ops/locations/index.md
+++ b/guide/ops/locations/index.md
@@ -20,7 +20,7 @@ Brooklyn supports a wide range of locations:
Configuration can be set in `~/.brooklyn/brooklyn.properties`, through the
location wizard tool available within the web console
or directly in YAML when specifying a location.
-On some entities, config keys determining maching selection and provisioning behavior
-can also be set `in `provisioning.properties`.
+On some entities, config keys determining matching selection and provisioning behavior
+can also be set in `provisioning.properties`.
{% child_content %}
[4/4] brooklyn-docs git commit: This closes #48
Posted by sj...@apache.org.
This closes #48
Typos
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/0de526b9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/0de526b9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/0de526b9
Branch: refs/heads/master
Commit: 0de526b9db061241b741d7d118afa81564c802c8
Parents: 10f4927 2437192
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Apr 20 18:00:55 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Apr 20 18:00:55 2016 +0100
----------------------------------------------------------------------
contributing/inline-children.md | 4 ++--
guide/ops/locations/index.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-docs git commit: This closes #41
Posted by sj...@apache.org.
This closes #41
Corrected brooklyn references
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/10f49278
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/10f49278
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/10f49278
Branch: refs/heads/master
Commit: 10f492785a3dfb37f53fb573c001b58f4eaa5a67
Parents: ffc3ee6 e70716e
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Apr 20 18:00:50 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Apr 20 18:00:50 2016 +0100
----------------------------------------------------------------------
guide/ops/locations/clouds.md | 2 +-
guide/ops/persistence/index.md | 2 +-
guide/start/running.md | 2 +-
guide/yaml/chef/about-chef.md | 4 ++--
website/documentation/increase-entropy.md | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------