You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/30 20:57:18 UTC
[11/12] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bf252a60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bf252a60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bf252a60
Branch: refs/heads/develop
Commit: bf252a6039b7a994dd21b4bff518f87c59965460
Parents: ae1c9ce ba8d2ab
Author: Steve Loughran <st...@apache.org>
Authored: Fri May 30 19:52:39 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri May 30 19:52:39 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo-v1_5/jmx_metrics.json | 16 +--
app-packages/hbase-v0_96/jmx_metrics.json | 6 +-
app-packages/hbase-v0_96/metainfo.xml | 4 +
app-packages/storm-v0_91/ganglia_metrics.json | 2 +-
app-packages/storm-v0_91/jmx_metrics.json | 4 +-
app-packages/storm-v0_91/metainfo.xml | 4 +
pom.xml | 103 +++++++++++++++++--
slider-agent/src/main/python/setup.py | 6 +-
src/site/markdown/architecture/architecture.md | 4 +-
src/site/markdown/architecture/index.md | 4 +-
src/site/markdown/architecture/rolehistory.md | 2 +-
src/site/markdown/client-configuration.md | 2 +-
src/site/markdown/configuration/core.md | 2 +-
.../markdown/configuration/index-markdown.md | 3 +-
src/site/markdown/configuration/index.md | 2 +-
src/site/markdown/configuration/redesign.md | 2 +-
.../markdown/configuration/specification.md | 2 +-
src/site/markdown/debugging.md | 2 +-
src/site/markdown/developing/building.md | 2 +-
.../markdown/developing/functional_tests.md | 2 +-
src/site/markdown/developing/index.md | 4 +-
src/site/markdown/developing/manual_testing.md | 2 +-
src/site/markdown/developing/releasing.md | 2 +-
src/site/markdown/developing/testing.md | 2 +-
src/site/markdown/examples.md | 2 +-
src/site/markdown/exitcodes.md | 2 +-
src/site/markdown/getting_started.md | 24 ++---
src/site/markdown/index.md | 21 +++-
src/site/markdown/manpage.md | 2 +-
.../registry/a_YARN_service_registry.md | 2 +-
src/site/markdown/registry/index.md | 6 +-
.../registry/initial_registry_design.md | 2 +-
.../markdown/registry/p2p_service_registries.md | 2 +-
src/site/markdown/registry/references.md | 2 +-
src/site/markdown/registry/registry-model.md | 2 +-
.../service_registry_end_to_end_scenario.md | 2 +-
...lication_registration_and_binding_problem.md | 2 +-
.../markdown/release_notes/release-0.22.0.md | 48 ---------
.../markdown/release_notes/release-0.30.0.md | 4 +-
src/site/markdown/security.md | 2 +-
.../slider_specs/application_configuration.md | 2 +-
.../slider_specs/application_definition.md | 2 +-
.../application_instance_configuration.md | 2 +-
.../markdown/slider_specs/application_needs.md | 2 +-
.../slider_specs/application_package.md | 2 +-
.../slider_specs/canonical_scenarios.md | 2 +-
.../slider_specs/creating_app_definitions.md | 2 +-
src/site/markdown/slider_specs/index.md | 6 +-
.../slider_specs/resource_specification.md | 2 +-
.../slider_specs/writing_app_command_scripts.md | 2 +-
src/site/markdown/specification/cli-actions.md | 2 +-
src/site/markdown/specification/index.md | 2 +-
src/site/markdown/specification/slider-model.md | 2 +-
src/site/markdown/troubleshooting.md | 2 +-
src/site/site.xml | 35 +++++--
55 files changed, 226 insertions(+), 150 deletions(-)
----------------------------------------------------------------------