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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: lib/licenses/crc32ex-0.1.1.txt lib/licenses/snappy-java-1.0.5.2.txt lib/licenses/snappy-java-1.0.5.txt lib/licenses/snappy-java-1.1.1.7.txt lib/licenses/thrift-server-0.3.5.txt lib/licenses/t

[3/4] 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/a5930afa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5930afa Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 10c0915,8e88f45..3cb51e2 --- a/src/java/org/apach

[3/4] 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/c870adc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c870adc2 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/1f135282 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f135282 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/464ca14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/464ca14a Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/99c6ad65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c6ad65 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/ec4b4d44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec4b4d44 Diff: http://git-wip-us.apache.org/repos/asf/c

[3/4] 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/b2b75601 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b75601 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/e7c2952d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7c2952d Diff: http://git-wip-us.apache.org/repos/asf/c

[3/4] 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/5b05b682 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b05b682 Diff: http://git-wip-us.apache.org/repos/asf

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

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

[3/4] 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/edca4dce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edca4dce Diff: http://git-wip-us.apache.org/repos/asf

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

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/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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

[3/4] 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/1142183f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1142183f Diff: http://git-wip-us.apache.org/repos/asf/c

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ffeebff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ff

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5431a88d Tree: http://git-wip-us.apach

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31db093c Tree: http://git-wip-us.apache.org/re

[3/4] 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/09147a8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09147a8b Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/a6dd2b89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6dd2b89 Diff: http://git-wip-us.apache.org/repos/asf

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

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

[3/4] 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/89596682 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89596682 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/751e4f9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/751e4f9e Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/50da872f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50da872f Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/40cef770 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40cef770 Diff: http://git-wip-us.apache.org/repos/asf

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

[3/4] 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/08a5dab0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08a5dab0 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/4c53dc3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c53dc3a Diff: http:/

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: NEWS.txt build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91946a4c Tree: http://git-wip-us.apache.org/repos/

[3/4] 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/271c9e4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/271c9e4a Diff: http://git-wip-us.apache.org/repos/asf

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

[3/4] 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/a9a84831 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9a84831 Diff: http:/

[3/4] 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/239927d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/239927d3 Diff: http://git-wip-us.apache.org/repos/asf

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

[3/4] 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/14d7a63b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14d7a63b Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/cda407ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cda407ae Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/c80964a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80964a7 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/4aa56ec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4aa56ec2 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 247d181,000

[3/4] 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/6a4489df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a4489df Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/889c1872 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/889c1872 Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/587b654e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/587b654e Diff: http://git-wip-us.apache.org/repos/asf

[3/4] 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/6fe6c99b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fe6c99b Diff: http:/

[3/4] 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/302eb46c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/302eb46c Diff: http://git-wip-us.apache.org/repos/asf