Updated Branches:
refs/heads/trunk 1aa9312f9 -> e8fa7edc8
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8fa7edc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8fa7edc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8fa7edc
Branch: refs/heads/trunk
Commit: e8fa7edc8e2ba6087c7e1c749d3f311ddaa4a85b
Parents: 1aa9312 500c3f3
Author: Sylvain Lebresne <[email protected]>
Authored: Thu Feb 28 14:06:11 2013 +0100
Committer: Sylvain Lebresne <[email protected]>
Committed: Thu Feb 28 14:06:11 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8fa7edc/CHANGES.txt
----------------------------------------------------------------------
