Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ad6db38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ad6db38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ad6db38 Branch: refs/heads/trunk Commit: 4ad6db380ac3f7a2a26fbf0aafe2364981c0912e Parents: 3b8482a eaa78e0 Author: Dave Brosius <[email protected]> Authored: Sat May 17 17:03:05 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat May 17 17:03:05 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/index/keys/KeysIndex.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ad6db38/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java ----------------------------------------------------------------------
