Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9175aa7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9175aa7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9175aa7e Branch: refs/heads/develop Commit: 9175aa7e5acd704faf9075076f5b1be61b3bb70f Parents: 032dacf 6b19cb8 Author: Steve Loughran <[email protected]> Authored: Wed Oct 8 09:55:26 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Wed Oct 8 09:55:26 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 9 +++++---- app-packages/accumulo/pom.xml | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
