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/92881598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92881598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92881598 Branch: refs/heads/trunk Commit: 9288159898605f8f160b040dab46be2c089b30c8 Parents: d641053 ad9f51f Author: Mikhail Stepura <mish...@apache.org> Authored: Mon Sep 8 12:21:36 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Mon Sep 8 12:21:36 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92881598/CHANGES.txt ----------------------------------------------------------------------
