Merge branch 'cassandra-2.2' into trunk
Conflicts:
src/java/org/apache/cassandra/schema/LegacySchemaTables.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/daa3fe61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/daa3fe61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/daa3fe61
Branch: refs/heads/trunk
Commit: daa3fe611fc4a4e53638f9664cce1a734f6fc4d1
Parents: 9ae7126 ee89c7e
Author: Sylvain Lebresne <[email protected]>
Authored: Wed Jul 22 10:07:45 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Wed Jul 22 10:07:45 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/daa3fe61/CHANGES.txt
----------------------------------------------------------------------
