Merge branch 'master' into blur-0.2.4-parcel
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/610e242e Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/610e242e Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/610e242e Branch: refs/heads/master Commit: 610e242eec589a0ed620014cd032a114963e09f7 Parents: 42052a8 6f0523a Author: Aaron McCurry <amccu...@gmail.com> Authored: Tue Jul 7 12:39:34 2015 -0400 Committer: Aaron McCurry <amccu...@gmail.com> Committed: Tue Jul 7 12:39:34 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 95 ++++++++++ LICENSE | 2 +- NOTICE | 2 +- .../src/main/scripts/bin/stop-shards.sh | 4 +- distribution/src/main/scripts/conf/consoles | 15 ++ distribution/src/main/scripts/conf/controllers | 15 ++ .../src/main/scripts/conf/default_zoo.cfg | 15 ++ distribution/src/main/scripts/conf/shards | 15 ++ distribution/src/main/scripts/conf/zookeepers | 15 ++ docs/release-notes.html | 185 +++++++++++++++---- pom.xml | 7 - release_scripts/build_release.sh | 3 +- release_scripts/hadoop2.versions | 4 +- release_scripts/release_profiles.txt | 4 +- 14 files changed, 324 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/610e242e/pom.xml ----------------------------------------------------------------------
