Merge branch 'master' of github.com:nearinfinity/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/ebbe065e Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ebbe065e Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ebbe065e Branch: refs/heads/master Commit: ebbe065ebe1b0e0736583b87f81720bc0ecf0d34 Parents: eeb05f3 8e1e8a4 Author: Aaron McCurry <[email protected]> Authored: Tue Aug 28 21:17:49 2012 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue Aug 28 21:17:49 2012 -0400 ---------------------------------------------------------------------- .../blur/thrift/ThriftBlurShardServer.java | 62 +++--- .../com/nearinfinity/blur/demo/SampleProgram.java | 168 +++++++++++++++ .../blur/store/blockcache/BlockCache.java | 64 +++--- .../blur/store/blockcache/BlockCacheLocation.java | 10 +- .../blur/store/BenchmarkDirectory.java | 8 +- .../blur/store/BenchmarkDirectoryNrt.java | 8 +- 6 files changed, 244 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
