You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/06/30 11:04:43 UTC
[3/4] brooklyn-docs git commit: Merge branch 'master' into fix-links
Merge branch 'master' into fix-links
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/1bb2c313
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/1bb2c313
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/1bb2c313
Branch: refs/heads/master
Commit: 1bb2c313937b7e55f19e75c6bb4e097a9ee5c352
Parents: aa4b366 e3f1219
Author: Murdo Aird <mu...@users.noreply.github.com>
Authored: Fri Jun 30 12:01:30 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Fri Jun 30 12:01:30 2017 +0100
----------------------------------------------------------------------
README.md | 10 +-
_config.yml | 8 +-
contributing/pdf-manual.md | 6 +-
guide/blueprints/advanced-example.md | 10 +-
guide/blueprints/catalog/bundle.md | 123 ++++++
guide/blueprints/catalog/cli.md | 31 ++
guide/blueprints/catalog/index.md | 395 +------------------
guide/blueprints/catalog/management.md | 58 +++
guide/blueprints/catalog/schema.md | 272 +++++++++++++
guide/blueprints/catalog/templates.md | 14 +
guide/blueprints/catalog/versioning.md | 20 +
.../chef/advanced-chef-integration.md | 15 +-
.../chef/example_yaml/mysql-chef-1.yaml | 43 +-
.../chef/example_yaml/mysql-chef-2.yaml | 47 ++-
guide/blueprints/effectors.md | 185 +++++++++
guide/blueprints/enrichers.md | 47 +--
.../appserver-configured-in-config.yaml | 6 -
.../example_yaml/appserver-configured.yaml | 5 +-
.../brooklyn-elasticsearch-catalog.bom | 125 ++++++
.../example_yaml/brooklyn-elk-catalog.bom | 94 +++++
.../example_yaml/brooklyn-kibana-catalog.bom | 58 +++
.../example_yaml/brooklyn-logstash-catalog.bom | 66 ++++
.../example_yaml/enricher-aggregator.yaml | 7 +
.../example_yaml/enricher-joiner.yaml | 6 +
.../example_yaml/enricher-propagator.yaml | 8 +
.../enricher-time-weighted-delta.yaml | 6 +
.../example_yaml/enricher-transformer.yaml | 6 +
guide/blueprints/example_yaml/simple-vm.yaml | 9 +-
...est-app-with-enrichers-slightly-simpler.yaml | 2 +-
.../vanilla-bash-netcat-catalog.bom | 15 +-
.../vanilla-bash-netcat-cluster.yaml | 2 +-
.../example_yaml/vanilla-bash-netcat-env.yaml | 16 +-
.../example_yaml/vanilla-bash-netcat-file.yaml | 3 +-
.../vanilla-bash-netcat-more-commands.yaml | 19 +-
.../vanilla-bash-netcat-port-parameter.yaml | 15 +-
.../example_yaml/vanilla-bash-netcat-port.yaml | 7 +-
.../vanilla-bash-netcat-restarter.yaml | 7 +-
.../vanilla-bash-netcat-w-client.yaml | 28 +-
.../example_yaml/vanilla-bash-netcat.yaml | 7 +-
guide/blueprints/index.md | 1 +
guide/blueprints/multiple-services.md | 11 -
.../entities/loopovergroupmembers-entity.yaml | 11 +-
.../entities/testeffector-entity.yaml | 13 +-
.../entities/testhttpcall-entity.yaml | 11 +-
.../entities/testsensor-entity.yaml | 11 +-
.../entities/testsshcommand-entity.yaml | 34 +-
.../testcases/effector-test-snippet.yaml | 41 +-
.../testcases/getting-started-test-example.yaml | 77 ++--
.../testcases/http-test-snippet.yaml | 34 +-
.../testcases/sensor-test-snippet.yaml | 11 +-
guide/dev/env/maven-build.md | 2 +-
guide/dev/tips/debugging-remote-brooklyn.md | 4 +-
guide/dev/tips/logging.md | 30 +-
guide/index.md | 1 +
guide/locations/_azure-ARM.md | 82 ++++
guide/locations/_clouds.md | 5 +-
.../_location-customizer-security-groups.md | 55 +++
guide/locations/_location-customizers.md | 178 +++++++++
guide/locations/_special-locations.md | 2 +-
guide/locations/index.md | 2 +-
guide/locations/location-customizers.md | 169 --------
.../provisioned-machine-requirements.md | 161 ++++++++
guide/misc/migrate-to-0.8.0.md | 2 +-
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/ops/logging.md | 8 +
guide/ops/osgi.md | 32 +-
guide/ops/production-installation.md | 3 +-
guide/ops/requirements.md | 10 +-
guide/ops/server-cli-reference.md | 2 +-
.../increase-system-resource-limits.md | 10 +
guide/ops/troubleshooting/memory-usage.md | 2 +-
guide/ops/troubleshooting/slow-unresponsive.md | 2 +-
guide/start/_my-web-cluster.yaml | 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
website/developers/code/git-more.md | 2 -
.../committers/release-process/prerequisites.md | 2 +-
website/developers/how-to-contribute.md | 9 +-
website/download/index.md | 2 +-
website/download/verify.md | 234 ++++++++---
website/index.md | 9 +-
81 files changed, 2125 insertions(+), 959 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/1bb2c313/guide/ops/logging.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/1bb2c313/guide/ops/osgi.md
----------------------------------------------------------------------
diff --cc guide/ops/osgi.md
index aa4d07f,97becec..8c26849
--- a/guide/ops/osgi.md
+++ b/guide/ops/osgi.md
@@@ -59,5 -67,5 +67,5 @@@ Hotspot JPDA: https://docs.oracle.com/
## Configuring
- Configuration of Brooklyn when running under Karaf is largely done through standard Karaf mechanisms.
+ Configuration of Brooklyn when running under Karaf is largely done through standard Karaf mechanisms.
-See the page on [OSGI Configuration](osgi-configuration.html) for details.
+See the page on [OSGI Configuration](osgi-configuration.html) for details.