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/df20b51e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/df20b51e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/df20b51e Branch: refs/heads/develop Commit: df20b51e408da76ead7b451cbfeda4923dcd5817 Parents: 6cbec31 d4f1ae5 Author: Steve Loughran <[email protected]> Authored: Wed Jul 22 12:48:12 2015 -0700 Committer: Steve Loughran <[email protected]> Committed: Wed Jul 22 12:48:12 2015 -0700 ---------------------------------------------------------------------- app-packages/hbase/appConfig-phoenix-default.json | 3 ++- app-packages/hbase/appConfig-secured-default.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
