[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-07-17 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 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/2d462c04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d462c04 Diff: http:/

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-04-15 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/730d4d4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/730d4d4c Diff: http://git-wip-us.apache.org/repos/asf

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-03-24 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5639eac1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5639eac1 Diff: http://git-wip-us.apache.org/repos/asf

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-03-05 Thread tylerhobbs
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c7a601b/test/unit/org/apache/cassandra/cql3/statements/SelectStatementTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/statements/SelectStatementTest.java index

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-03-03 Thread yukim
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d1e46e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d1e46e4 Diff: http://git-wip-us.apache.org/repos/asf

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-02-13 Thread benedict
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableReader.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2015-02-11 Thread benedict
Merge branch 'cassandra-2.0' into cassandra-2.1 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/bf43534d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf43534d Diff: http:/

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-11-27 Thread aleksey
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/tools/NodeTool.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 1db0245,000..fe4535b mode 100644,00..1006

[3/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-11-19 Thread tylerhobbs
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a4c9e1/test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java index bcf4f27,ea4f1a6..4c