Merge branch 'feature/SLIDER-38_berlin-buzz_cleanup' 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/1358c655 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1358c655 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1358c655 Branch: refs/heads/develop Commit: 1358c6558523fb5f083dbf42180f1097d151b194 Parents: 3e91285 4063d4a Author: Steve Loughran <ste...@apache.org> Authored: Fri May 23 18:47:38 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri May 23 18:47:38 2014 +0100 ---------------------------------------------------------------------- slider-core/pom.xml | 18 +- .../org/apache/slider/client/SliderClient.java | 2 +- .../apache/slider/common/tools/SliderUtils.java | 1 + .../slider/core/build/InstanceBuilder.java | 4 +- .../core/registry/zk/BlockingZKWatcher.java | 63 --- .../slider/core/registry/zk/ZKCallback.java | 31 -- .../slider/core/registry/zk/ZKIntegration.java | 280 ------------ .../slider/core/registry/zk/ZKPathBuilder.java | 82 ---- .../slider/core/registry/zk/ZookeeperUtils.java | 136 ------ .../slider/core/zk/BlockingZKWatcher.java | 63 +++ .../slider/core/zk/MiniZooKeeperCluster.java | 423 +++++++++++++++++++ .../org/apache/slider/core/zk/ZKCallback.java | 31 ++ .../apache/slider/core/zk/ZKIntegration.java | 280 ++++++++++++ .../apache/slider/core/zk/ZKPathBuilder.java | 82 ++++ .../apache/slider/core/zk/ZookeeperUtils.java | 134 ++++++ .../slideram/SliderAMClientProvider.java | 16 - .../utility/AbstractSliderLaunchedService.java | 2 +- .../common/tools/GroovyZKIntegration.groovy | 2 +- .../common/tools/TestZKIntegration.groovy | 3 +- .../apache/slider/test/MicroZKCluster.groovy | 18 +- .../slider/test/YarnMiniClusterTestBase.groovy | 6 +- .../test/YarnZKMiniClusterTestBase.groovy | 7 +- .../slider/test/MiniZooKeeperCluster.java | 395 +++++++++++++++++ .../accumulo/AccumuloProviderService.java | 3 +- .../live/TestAccCorrectInstanceName.groovy | 2 +- .../accumulo/live/TestAccFreezeThaw.groovy | 2 +- .../accumulo/live/TestAccLiveHDFSArchive.groovy | 2 +- .../live/TestAccLiveLocalArchive.groovy | 2 +- .../accumulo/live/TestAccM1T1GC1Mon1.groovy | 2 +- .../accumulo/live/TestAccM2T2GC1Mon1.groovy | 2 +- .../accumulo/live/TestAccumuloAMWebApp.groovy | 2 +- .../providers/hbase/HBaseClientProvider.java | 2 +- .../minicluster/live/TestHBaseMaster.groovy | 2 +- .../live/TestHBaseMasterWithBadHeap.groovy | 3 - .../live/TestLiveRegionServiceOnHDFS.groovy | 2 +- 35 files changed, 1444 insertions(+), 661 deletions(-) ----------------------------------------------------------------------