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