Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/b250ead1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b250ead1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b250ead1 Branch: refs/heads/master Commit: b250ead1cac498c20bb56a32b4c556fe3621a810 Parents: 551cce6 f9c7a6b Author: Chris Rohr <[email protected]> Authored: Fri Sep 6 21:26:18 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Fri Sep 6 21:26:18 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 155 ++++++++++++++ blur-core/pom.xml | 2 +- .../blur/thrift/ThriftBlurShardServer.java | 78 ++++--- blur-gui/pom.xml | 2 +- blur-jdbc/pom.xml | 2 +- blur-mapred/pom.xml | 2 +- .../mapreduce/lib/BlurOutputFormatTest.java | 5 +- blur-query/pom.xml | 2 +- blur-shell/pom.xml | 2 +- blur-store/pom.xml | 2 +- .../store/BlockCacheDirectoryFactoryV2.java | 62 ------ .../blur/store/blockcache_v2/BaseCache.java | 210 ------------------- .../apache/blur/store/blockcache_v2/Cache.java | 138 ------------ .../store/blockcache_v2/CacheDirectory.java | 147 ------------- .../store/blockcache_v2/CacheIndexInput.java | 171 --------------- .../store/blockcache_v2/CacheIndexOutput.java | 130 ------------ .../blur/store/blockcache_v2/CacheKey.java | 89 -------- .../blur/store/blockcache_v2/CacheValue.java | 93 -------- .../store/blockcache_v2/FileNameBlockSize.java | 24 --- .../store/blockcache_v2/FileNameFilter.java | 24 --- .../cachevalue/BaseCacheValue.java | 83 -------- .../cachevalue/ByteArrayCacheValue.java | 55 ----- .../cachevalue/UnsafeCacheValue.java | 99 --------- .../apache/blur/store/hdfs/HdfsDirectory.java | 3 +- .../blockcache_v2/CacheIndexInputTest.java | 206 ------------------ .../blockcache_v2/CacheIndexOutputTest.java | 101 --------- .../cachevalue/ByteArrayCacheValueTest.java | 68 ------ .../cachevalue/UnsafeCacheValueTest.java | 68 ------ blur-thrift/pom.xml | 2 +- blur-util/pom.xml | 2 +- .../resources/org/apache/blur/doc/header.html | 7 +- contrib/blur-console/blur-agent/pom.xml | 12 +- distribution/pom.xml | 4 +- docs/Blur.html | 7 +- docs/cluster-setup.html | 11 +- docs/data-model.html | 5 +- docs/extra.html | 3 +- docs/getting-started.html | 15 +- docs/index.html | 6 +- docs/release-notes.template.html | 72 +++++++ docs/template.html | 3 +- docs/using-blur.base.html | 5 +- docs/using-blur.html | 5 +- pom.xml | 5 +- 44 files changed, 337 insertions(+), 1850 deletions(-) ----------------------------------------------------------------------
