Updated Branches:
refs/heads/trunk e3f642b8c -> 1b56ad122
Merge branch 'cassandra-1.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/CFPropDefs.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b56ad12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b56ad12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b56ad12
Branch: refs/heads/trunk
Commit: 1b56ad122ee966757865e8de589d1d93af3f3242
Parents: e3f642b 6eafeb2
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Oct 5 18:55:48 2012 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Oct 5 18:55:48 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b56ad12/CHANGES.txt
----------------------------------------------------------------------
