Merge branch 'feature/SLIDER-671-mvn-publish' 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/364eca0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/364eca0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/364eca0f Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 364eca0fa3c209f2c49a6f718bb25552f02ff38d Parents: bb64417 270ddc2 Author: Steve Loughran <[email protected]> Authored: Fri Dec 5 15:36:50 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Dec 5 15:36:50 2014 +0000 ---------------------------------------------------------------------- pom.xml | 73 ++++++++++---------- .../apache/slider/api/ClusterDescription.java | 14 ++-- .../java/org/apache/slider/api/ClusterNode.java | 2 +- .../org/apache/slider/api/ResourceKeys.java | 2 +- .../org/apache/slider/client/SliderClient.java | 5 +- .../apache/slider/client/SliderClientAPI.java | 5 +- .../slider/client/SliderClusterOperations.java | 1 - .../slider/common/tools/CoreFileSystem.java | 11 ++- .../apache/slider/common/tools/SliderUtils.java | 6 +- .../slider/core/build/InstanceBuilder.java | 1 - .../slider/core/launch/AbstractLauncher.java | 4 +- .../slider/core/launch/AppMasterLauncher.java | 4 +- .../slider/core/main/ServiceLauncher.java | 2 +- .../slider/core/persist/JsonSerDeser.java | 4 +- .../core/registry/docstore/ConfigFormat.java | 2 +- .../docstore/PublishedConfiguration.java | 4 +- .../PublishedConfigurationOutputter.java | 2 +- .../registry/docstore/PublishedExports.java | 6 +- .../docstore/PublishedExportsOutputter.java | 2 +- .../core/registry/retrieve/AMWebClient.java | 2 +- .../apache/slider/core/zk/ZKIntegration.java | 9 ++- .../slider/providers/ProviderService.java | 3 +- .../apache/slider/providers/ProviderUtils.java | 2 +- .../providers/agent/AgentProviderService.java | 38 +++++----- .../LaunchedWorkflowCompositeService.java | 2 +- 25 files changed, 97 insertions(+), 109 deletions(-) ----------------------------------------------------------------------
