Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/9adf4d3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9adf4d3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9adf4d3c Branch: refs/heads/develop Commit: 9adf4d3c66d691b2c938e503429b83d4489e6eb3 Parents: 63b08d1 af62e17 Author: Steve Loughran <[email protected]> Authored: Wed Jun 3 10:58:00 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Jun 3 10:58:00 2015 +0100 ---------------------------------------------------------------------- .../accumulo/appConfig-secured-default.json | 1 + .../package/scripts/accumulo_configuration.py | 16 ++++++++++++++++ .../funtest/accumulo/AccumuloReadWriteIT.groovy | 8 ++++++-- app-packages/solr/README.md | 2 -- app-packages/solr/metainfo.xml | 6 +----- .../apache/slider/client/TestClientBasicArgs.groovy | 2 +- .../providers/agent/TestAgentClientProvider2.java | 8 ++++++-- 7 files changed, 31 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
