You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:52:14 UTC
[26/50] git commit: Merge branch 'cassandra-1.1' into trunk
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.0
Commit: ddc771dc5f1af98dde42d494f91cc398929c8515
Parents: 30ee833 6a6bf3c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Feb 13 12:27:00 2012 +0100
Committer: Sylvain Lebresne <sy...@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(-)
----------------------------------------------------------------------