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/e0a6a106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/e0a6a106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/e0a6a106 Branch: refs/heads/master Commit: e0a6a106e3d8b7fd29c4220ccedb09fa23b32a82 Parents: 3e1ec35 f1c6c60 Author: Aaron McCurry <[email protected]> Authored: Sat Feb 28 10:32:03 2015 -0500 Committer: Aaron McCurry <[email protected]> Committed: Sat Feb 28 10:32:03 2015 -0500 ---------------------------------------------------------------------- .../apache/blur/server/cache/ThriftCache.java | 22 +++-- .../server/cache/ThriftCacheServerTest.java | 93 ++++++++------------ 2 files changed, 52 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
