Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/AtomicSortedColumns.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9691e82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9691e82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9691e82
Branch: refs/heads/trunk
Commit: d9691e823930982d120c2a237c7087245b003f0d
Parents: 2fd2d89 0e55e9f
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Jan 14 15:37:40 2014 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Jan 14 15:37:40 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
