[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/13e153b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13e153b0 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/f0f9cf23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0f9cf23 Diff:

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

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/b45cb104 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b45cb104 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/c5fdb32c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5fdb32c Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/2e4a8490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4a8490 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/e2050c97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2050c97 Diff:

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

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/7550ebd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7550ebd9 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af509ec9/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 427fc29,000..8469836 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2481 -1,0 +1,2483 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d558fc/pylib/cqlshlib/copyutil.py -- diff --cc pylib/cqlshlib/copyutil.py index a2fab00,f699e64..a117ec3 --- a/pylib/cqlshlib/copyutil.py +++ b/pylib/cqlshlib/copyutil.py @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/7e3e1191 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e3e1191 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/e491f05b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e491f05b Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/9f19dd4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f19dd4e Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/882df8a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882df8a2 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/432a8a48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432a8a48 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/d44dbe19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d44dbe19 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/test/unit/org/apache/cassandra/cql3/validation/operations/DropTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/DropTest.java index

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/db970837 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db970837 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/8bfdd65c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/96b7603d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b7603d Diff:

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1142183f/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 41672c0,000..ffcbcbd mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2690 -1,0 +1,2699 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/2aa83426 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2aa83426 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/bdd88a2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdd88a2f Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/da4b9716 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da4b9716 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0fd5178/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 94c7af3,000..41672c0 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2674 -1,0 +1,2690 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/073f0626 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/073f0626 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/95feab66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95feab66 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/d09b6c69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d09b6c69 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/077f9bf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/077f9bf5 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2f243ee/pylib/cqlshlib/copy.py -- diff --cc pylib/cqlshlib/copy.py index 000,8534b98..8ff474f mode 00,100644..100644 --- a/pylib/cqlshlib/copy.py +++

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/a68f8bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a68f8bd7 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/afe3fe3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afe3fe3d Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/d434a33a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d434a33a Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/84d44885 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84d44885 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/b0def95b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0def95b Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 17bddd3,000..a6070ef mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2737 -1,0 +1,2737 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb429063/pylib/cqlshlib/tracing.py -- diff --cc pylib/cqlshlib/tracing.py index 40d22f0,40d22f0..2ded259 --- a/pylib/cqlshlib/tracing.py +++ b/pylib/cqlshlib/tracing.py @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/40cef770/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 7f2d39b,000..09da020 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2743 -1,0 +1,2744 @@@

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

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/bbaa9630 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbaa9630 Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 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/20d55086 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20d55086 Diff:

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

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/f497c13e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f497c13e Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/50da872f/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 6f3f816,000..a15fb02 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2735 -1,0 +1,2740 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/751e4f9e/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 55f7ee9,000..6f3f816 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2732 -1,0 +1,2735 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89596682/bin/cqlsh.py -- diff --cc bin/cqlsh.py index e2691cc,000..55f7ee9 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2735 -1,0 +1,2732 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/757dac9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/757dac9c Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 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/f3ad68cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ad68cb Diff:

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/doc/cql3/CQL.textile -- diff --cc doc/cql3/CQL.textile index ce712be,cc041df..aa0468b --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -1,6 -1,6 +1,7 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2b75601/bin/cqlsh.py -- diff --cc bin/cqlsh.py index c991cc7,000..4fce833 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2697 -1,0 +1,2697 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/464ca14a/bin/cqlsh.py -- diff --cc bin/cqlsh.py index bfb3a24,000..c991cc7 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2695 -1,0 +1,2697 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c870adc2/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/nodetool/Status.java -- diff --cc src/java/org/apache/cassandra/tools/nodetool/Status.java index c4b2295,000..99f745d mode

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/d526536f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d526536f Diff:

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ffeebff/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 6df1d75,000..11f110d mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2668 -1,0 +1,2675 @@@

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a090cc5/src/java/org/apache/cassandra/io/util/FileUtils.java -- diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java index 3552ca9,3be7c99..9f5193b ---

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/269059e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/269059e8 Diff: