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/4b028795 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b028795 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b028795 Branch: refs/heads/trunk Commit: 4b0287957bc77a2cbb3aa8eb06481ed32ac1c775 Parents: d24513e c6bed82 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue May 13 17:52:35 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue May 13 17:52:35 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/triggers/InvertedIndex.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b028795/CHANGES.txt ----------------------------------------------------------------------