Merge branch 'release/slider-0.50.2' into develop
Conflicts:
app-packages/accumulo/pom.xml
app-packages/command-logger/application-pkg/pom.xml
app-packages/command-logger/slider-pkg/pom.xml
pom.xml
slider-agent/pom.xml
slider-assembly/pom.xml
slider-core/pom.xml
slider-funtest/pom.xml
slider-providers/accumulo/accumulo-funtests/pom.xml
slider-providers/accumulo/slider-accumulo-provider/pom.xml
slider-providers/hbase/hbase-funtests/pom.xml
slider-providers/hbase/slider-hbase-provider/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1e0d1e80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1e0d1e80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1e0d1e80
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 1e0d1e80f19d3e6a1a6e08c7936ff858965f6fae
Parents: afaa8e4 bc6c710
Author: Steve Loughran <[email protected]>
Authored: Fri Aug 22 12:23:58 2014 +0100
Committer: Steve Loughran <[email protected]>
Committed: Fri Aug 22 12:23:58 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
slider-providers/accumulo/accumulo-funtests/pom.xml | 2 +-
slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
slider-providers/hbase/slider-hbase-provider/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
