[2/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-11 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/228f0ade Tree:

[2/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-06 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a50f010 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a50f010 Diff:

[2/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-30 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4d23e16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4d23e16 Diff: