Merge branch 'cassandra-1.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/ddc771dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddc771dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddc771dc Branch: refs/heads/cassandra-1.1 Commit: ddc771dc5f1af98dde42d494f91cc398929c8515 Parents: 30ee833 6a6bf3c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 13 12:27:00 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 13 12:27:00 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../org/apache/cassandra/config/CFMetaData.java | 15 ++++++++++++--- .../cassandra/db/index/SecondaryIndexManager.java | 6 ++++++ 3 files changed, 23 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
