Merge branch 'develop' into feature/SLIDER-622-windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f9d7d450 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f9d7d450 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f9d7d450 Branch: refs/heads/develop Commit: f9d7d4503491fbdcbb462d828996157d3b5d462d Parents: b2768a1 56bc48d Author: Steve Loughran <[email protected]> Authored: Tue Nov 11 13:37:54 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 11 13:37:54 2014 +0000 ---------------------------------------------------------------------- .../live/TestAccCorrectInstanceName.groovy | 17 +++-------------- .../accumulo/live/TestAccFreezeThaw.groovy | 6 +----- .../accumulo/live/TestAccLiveHDFSArchive.groovy | 8 ++------ .../accumulo/live/TestAccLiveLocalArchive.groovy | 8 ++------ .../accumulo/live/TestAccM1T1GC1Mon1.groovy | 8 ++------ .../accumulo/live/TestAccM2T2GC1Mon1.groovy | 8 ++------ .../accumulo/live/TestAccumuloAMWebApp.groovy | 10 +++------- .../accumulo/live/TestInvalidMonitorAddress.groovy | 10 +++++----- .../hbase/minicluster/live/Test2Master2RS.groovy | 6 +++--- .../hbase/minicluster/live/TestHBaseMaster.groovy | 11 ++++------- .../minicluster/live/TestHBaseMasterOnHDFS.groovy | 2 +- .../live/TestLiveRegionServiceOnHDFS.groovy | 5 +---- .../live/TestLiveTwoNodeRegionService.groovy | 6 +++--- .../minicluster/live/TestTwoLiveClusters.groovy | 6 +++--- 14 files changed, 35 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
