[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-12-15 Thread aleksey
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d558fc/bin/cqlsh.py -- diff --cc bin/cqlsh.py index a3fa666,000..42c2923 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2763 -1,0 +1,2486 @@@

[3/6] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

2015-11-24 Thread blerer
Merge branch cassandra-2.1 into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1142183f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1142183f Diff:

[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-11-20 Thread slebresne
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0fd5178 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0fd5178 Diff:

[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-11-18 Thread tylerhobbs
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2f243ee/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 64536e1,000..94c7af3 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2737 -1,0 +1,2674 @@@

[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-11-06 Thread aleksey
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb429063/bin/cqlsh.py -- diff --cc bin/cqlsh.py index a6070ef,000..64536e1 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2737 -1,0 +1,2737 @@@

[3/6] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

2015-09-17 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 2636a59,000..81c998c mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2703 -1,0 +1,2703 @@@

[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-09-07 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c6ad65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c6ad65 Diff:

[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-06-02 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30d8bd2/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java -- diff --cc