[1/4] cassandra git commit: fix up misapply of CASSANDRA-7964 nits

sandra/commit/f8524011 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8524011 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8524011 Branch: refs/heads/cassandra-2.1 Commit: f852401166cdd1e6b2136b5e70b85a771f6f2a8f Parents: d5e5f98 Author: Benedict Elliott Smith Authored: W

cassandra git commit: Fix regression in SSTableRewriter causing some rows to become unreadable during compaction

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 bedd97f7a -> 871f0039c Fix regression in SSTableRewriter causing some rows to become unreadable during compaction patch by marcus and benedict for CASSANDRA-8429 Project: http://git-wip-us.apache.org/repos/asf/cassandra/r

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

unk Commit: 9a51c3c3a891f2a22189b53db48b767b9a0400ca Parents: 7783f13 871f003 Author: Benedict Elliott Smith Authored: Fri Dec 19 14:31:06 2014 + Committer: Benedict Elliott Smith Committed: Fri Dec 19 14:31:06 2014 + -- C

[1/3] cassandra git commit: Fix regression in SSTableRewriter causing some rows to become unreadable during compaction

Repository: cassandra Updated Branches: refs/heads/trunk 7783f130c -> 9a51c3c3a Fix regression in SSTableRewriter causing some rows to become unreadable during compaction patch by marcus and benedict for CASSANDRA-8429 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a51c3c3/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java index c017530,000

cassandra git commit: fix imports

dra/tree/58529c77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58529c77 Branch: refs/heads/cassandra-2.1 Commit: 58529c77f4a2159fbfbe696c619787c327c80763 Parents: 871f003 Author: Benedict Elliott Smith Authored: Fri Dec 19 15:43:38 2014 + Committer: Benedict Elliott Smith Commit

[1/2] cassandra git commit: fix imports

ree/58529c77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58529c77 Branch: refs/heads/trunk Commit: 58529c77f4a2159fbfbe696c619787c327c80763 Parents: 871f003 Author: Benedict Elliott Smith Authored: Fri Dec 19 15:43:38 2014 + Committer: Benedict Elliott Smith Committed: Fri Dec 19

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/82a97f52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82a97f52 Branch: refs/heads/trunk Commit: 82a97f52eaeb0ecdaed96cab09d9e9d082a8dfcd Parents: 9a51c3c 58529c7 Author: Benedict Elliott Smith Authored: Fri Dec 19 15:45:33 2014 + Committer

[1/3] cassandra git commit: ninja remove synchronized from MappedFileDataInput.readBytes

he.org/repos/asf/cassandra/commit/5cff788e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cff788e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cff788e Branch: refs/heads/cassandra-2.1 Commit: 5cff788efcc63ac738e16ca8cd912e1108d5c1be Parents: 29ff2d2 Author: Benedict E

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

/repos/asf/cassandra/diff/20ccf46f Branch: refs/heads/trunk Commit: 20ccf46f1830859f0e2fbacf0b9dc8ac69907f35 Parents: 977cbdd 5cff788 Author: Benedict Elliott Smith Authored: Mon Dec 22 15:39:38 2014 + Committer: Benedict Elliott Smith Committed: Mon Dec 22 15:39:38

[2/3] cassandra git commit: ninja remove synchronized from MappedFileDataInput.readBytes

-us.apache.org/repos/asf/cassandra/diff/5cff788e Branch: refs/heads/trunk Commit: 5cff788efcc63ac738e16ca8cd912e1108d5c1be Parents: 29ff2d2 Author: Benedict Elliott Smith Authored: Mon Dec 22 15:39:29 2014 + Committer: Benedict Elliott Smith Committed: Mon Dec 22 15:39:29 2014 +

[1/3] cassandra git commit: ninja fix CommitLogAllocator error suppression on shutdown for CASSANDRA-8474

Author: Benedict Elliott Smith Authored: Mon Jan 5 16:20:19 2015 + Committer: Benedict Elliott Smith Committed: Mon Jan 5 16:20:19 2015 + -- .../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 5 ++--- 1 file c

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

/repos/asf/cassandra/diff/ec15878e Branch: refs/heads/trunk Commit: ec15878ef1351be6fe00c581b74d398a8255a1c3 Parents: 1dcf66b c1374ae Author: Benedict Elliott Smith Authored: Mon Jan 5 16:21:03 2015 + Committer: Benedict Elliott Smith Committed: Mon Jan 5 16:21:03

[2/3] cassandra git commit: ninja fix CommitLogAllocator error suppression on shutdown for CASSANDRA-8474

://git-wip-us.apache.org/repos/asf/cassandra/diff/c1374ae4 Branch: refs/heads/trunk Commit: c1374ae427bb439a4abd6c7284dfe2b5563bc8e1 Parents: aeb7d3f Author: Benedict Elliott Smith Authored: Mon Jan 5 16:20:19 2015 + Committer: Benedict Elliott Smith Committed: Mon Jan 5 16:20:19 2015 +

[2/6] cassandra git commit: Ensure SSTableWriter cleans up properly after failure

Ensure SSTableWriter cleans up properly after failure patch by benedict; reviewed by marcuse Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3679b1bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

http://git-wip-us.apache.org/repos/asf/cassandra/diff/55750e07 Branch: refs/heads/trunk Commit: 55750e07d20b76bf2c9f07575bfcb9193734bf24 Parents: edf48f8 3679b1b Author: Benedict Elliott Smith Authored: Wed Jan 7 13:05:16 2015 + Committer: Benedict Elliott Smith Committed: Wed Jan 7 13:05:16

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

/repos/asf/cassandra/diff/729ebe07 Branch: refs/heads/trunk Commit: 729ebe078a67fd1aa779b26a4738b76da23af04d Parents: e1e28d0 55750e0 Author: Benedict Elliott Smith Authored: Wed Jan 7 13:05:33 2015 + Committer: Benedict Elliott Smith Committed: Wed Jan 7 13:05:33

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

http://git-wip-us.apache.org/repos/asf/cassandra/diff/55750e07 Branch: refs/heads/cassandra-2.1 Commit: 55750e07d20b76bf2c9f07575bfcb9193734bf24 Parents: edf48f8 3679b1b Author: Benedict Elliott Smith Authored: Wed Jan 7 13:05:16 2015 + Committer: Benedict Elliott Smith Committed: Wed Jan

[3/6] cassandra git commit: Ensure SSTableWriter cleans up properly after failure

Ensure SSTableWriter cleans up properly after failure patch by benedict; reviewed by marcuse Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3679b1bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/6] cassandra git commit: Ensure SSTableWriter cleans up properly after failure

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 e27cdf935 -> 3679b1bd2 refs/heads/cassandra-2.1 edf48f817 -> 55750e07d refs/heads/trunk e1e28d0f0 -> 729ebe078 Ensure SSTableWriter cleans up properly after failure patch by benedict; reviewed by marcuse Proj

cassandra git commit: Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 8078a58f2 -> eeaa3e012 Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion patch by benedict; reviewed by yukim for CASSANDRA-7704 Project: http://git-wip-us.apache.

[2/3] cassandra git commit: Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion

Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion patch by benedict; reviewed by yukim for CASSANDRA-7704 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[1/3] cassandra git commit: Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 561293d13 -> ddca610c9 refs/heads/trunk 6041d41cd -> 0a80fe4b5 Fix race condition in StreamTransferTask that could lead to infinite loops and premature sstable deletion patch by benedict; reviewed by yukim for CASSANDR

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

apache.org/repos/asf/cassandra/tree/0a80fe4b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a80fe4b Branch: refs/heads/trunk Commit: 0a80fe4b57c4d56ec65be4c370674cece1283329 Parents: 6041d41 ddca610 Author: Benedict Elliott Smith Authored: Wed Jan 7 20:03:40 2015 + Committer

cassandra git commit: Fix cassandra-stress user-mode truncation of partition generation

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 576a75f28 -> 1435b9a87 Fix cassandra-stress user-mode truncation of partition generation patch by benedict; reviewed by tjake for CASSANDRA-8608 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[1/2] cassandra git commit: Fix cassandra-stress user-mode truncation of partition generation

Repository: cassandra Updated Branches: refs/heads/trunk 37f127897 -> 184bb65fc Fix cassandra-stress user-mode truncation of partition generation patch by benedict; reviewed by tjake for CASSANDRA-8608 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

http://git-wip-us.apache.org/repos/asf/cassandra/diff/184bb65f Branch: refs/heads/trunk Commit: 184bb65fcafb8603840fbbbda59665dcda275da3 Parents: 37f1278 1435b9a Author: Benedict Elliott Smith Authored: Wed Jan 21 16:52:20 2015 + Committer: Benedict Elliott Smith Committed: Wed Jan 21 16:52:20

cassandra git commit: fixup burn test compilation

pos/asf/cassandra/tree/b6dd6b48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6dd6b48 Branch: refs/heads/cassandra-2.1 Commit: b6dd6b48dba7baa82bed9a7b8514e18bd8b3b942 Parents: fe65707 Author: Benedict Elliott Smith Authored: Tue Jun 30 13:21:36 2015 +0100 Committer: Benedict Elli

[1/5] cassandra git commit: fixup burn test compilation

commit/b6dd6b48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6dd6b48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6dd6b48 Branch: refs/heads/cassandra-2.2 Commit: b6dd6b48dba7baa82bed9a7b8514e18bd8b3b942 Parents: fe65707 Author: Benedict Elliott Smith Authored: Tue Jun 30

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

/repos/asf/cassandra/diff/543efe92 Branch: refs/heads/trunk Commit: 543efe9243692cee2a06dce37e06eb87d1df8a57 Parents: 3566843 5892732 Author: Benedict Elliott Smith Authored: Tue Jun 30 13:22:55 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jun 30 13:22:55 2015 +0100 -- --

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

.org/repos/asf/cassandra/diff/58927321 Branch: refs/heads/trunk Commit: 5892732149f05693385a74eb74ba4c235b546eb9 Parents: c1e7643 b6dd6b4 Author: Benedict Elliott Smith Authored: Tue Jun 30 13:22:43 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jun 30 13:22:43 2015 +0100 -- --

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

.org/repos/asf/cassandra/diff/58927321 Branch: refs/heads/cassandra-2.2 Commit: 5892732149f05693385a74eb74ba4c235b546eb9 Parents: c1e7643 b6dd6b4 Author: Benedict Elliott Smith Authored: Tue Jun 30 13:22:43 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jun 30 13:22:43 2015 +0100 -- --

[2/5] cassandra git commit: fixup burn test compilation

/b6dd6b48 Branch: refs/heads/trunk Commit: b6dd6b48dba7baa82bed9a7b8514e18bd8b3b942 Parents: fe65707 Author: Benedict Elliott Smith Authored: Tue Jun 30 13:21:36 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jun 30 13:21:36 2015 +0100

cassandra git commit: Enforce simple << complex sort order more strictly and efficiently

Repository: cassandra Updated Branches: refs/heads/trunk 22590c72a -> 6092b01e3 Enforce simple << complex sort order more strictly and efficiently patch by benedict; reviewed by slebresne for CASSANDRA-9701 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: h

[4/5] cassandra git commit: Switch to DataInputPlus

http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f72acd/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java -- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apac

[2/5] cassandra git commit: Switch to DataInputPlus

http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f72acd/src/java/org/apache/cassandra/utils/StreamingHistogram.java -- diff --git a/src/java/org/apache/cassandra/utils/StreamingHistogram.java b/src/java/org/apache/cassandra

[1/5] cassandra git commit: add vInt encoding to Data(Input|Output)Plus

Repository: cassandra Updated Branches: refs/heads/trunk 6092b01e3 -> 03f72acd5 add vInt encoding to Data(Input|Output)Plus patch by ariel and benedict for CASSANDRA-9499 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[5/5] cassandra git commit: Switch to DataInputPlus

Switch to DataInputPlus patch by ariel; reviewed by benedict for CASSANDRA-9499 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03f72acd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03f72acd Diff: http

[3/5] cassandra git commit: Switch to DataInputPlus

http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f72acd/src/java/org/apache/cassandra/io/util/DataInputPlus.java -- diff --git a/src/java/org/apache/cassandra/io/util/DataInputPlus.java b/src/java/org/apache/cassandra/io/ut

[1/6] cassandra git commit: Ensure memtable book keeping is not corrupted in the event we shrink usage

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c5f03a988 -> b757db148 refs/heads/cassandra-2.2 92e2e4e46 -> 99f7ce9bf refs/heads/trunk 03f72acd5 -> dea6ab1b7 Ensure memtable book keeping is not corrupted in the event we shrink usage patch by benedict; reviewed

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/99f7ce9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99f7ce9b Branch: refs/heads/cassandra-2.2 Commit: 99f7ce9bfb03ad5eda21d3604b3844fc193d0f6f Parents: 92e2e4e b757db1 Author: Benedict Elliott Smith Authored: Thu Jul 2 10:33:51

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/99f7ce9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99f7ce9b Branch: refs/heads/trunk Commit: 99f7ce9bfb03ad5eda21d3604b3844fc193d0f6f Parents: 92e2e4e b757db1 Author: Benedict Elliott Smith Authored: Thu Jul 2 10:33:51 2015 +0100

[2/6] cassandra git commit: Ensure memtable book keeping is not corrupted in the event we shrink usage

Ensure memtable book keeping is not corrupted in the event we shrink usage patch by benedict; reviewed by tjake for CASSANDRA-9681 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b757db14 Tree: http://git-wip

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

/repos/asf/cassandra/commit/dea6ab1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dea6ab1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dea6ab1b Branch: refs/heads/trunk Commit: dea6ab1b769943eedaeb590d545d7c476c4a2466 Parents: 03f72ac 99f7ce9 Author: Benedict Elliott Smith

[3/6] cassandra git commit: Ensure memtable book keeping is not corrupted in the event we shrink usage

Ensure memtable book keeping is not corrupted in the event we shrink usage patch by benedict; reviewed by tjake for CASSANDRA-9681 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b757db14 Tree: http://git-wip

cassandra git commit: Precompute partial ColumnIdentifier comparison

Repository: cassandra Updated Branches: refs/heads/trunk 07d38b03a -> 8c8103cae Precompute partial ColumnIdentifier comparison patch by benedict; reviewed by sylvain for CASSANDRA-9706 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[4/4] cassandra git commit: Ensure StreamSession uses canonical sstable instances

Ensure StreamSession uses canonical sstable instances patch by benedict; reviewed by yukim for CASSANDRA-9700 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61aeb910 Tree: http://git-wip-us.apache.org/repos/asf

[1/4] cassandra git commit: Ensure StreamSession uses canonical sstable instances

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7473877ee -> 98ac45a8a refs/heads/cassandra-2.2 1411ad5f6 -> 4aa56ec24 refs/heads/trunk 7813dee0c -> 61aeb9109 Ensure StreamSession uses canonical sstable instances patch by benedict; reviewed by yukim for CASSA

[2/4] cassandra git commit: Ensure StreamSession uses canonical sstable instances

Ensure StreamSession uses canonical sstable instances patch by benedict; reviewed by yukim for CASSANDRA-9700 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98ac45a8 Tree: http://git-wip-us.apache.org/repos/asf

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

.org/repos/asf/cassandra/diff/4aa56ec2 Branch: refs/heads/cassandra-2.2 Commit: 4aa56ec2454931f2d34eaef51699c9b37ea8efcd Parents: 1411ad5 98ac45a Author: Benedict Elliott Smith Authored: Thu Jul 2 18:05:26 2015 +0100 Committer: Benedict Elliott Smith Committed: Thu Jul 2 18:05:26

[01/12] cassandra git commit: Ensure StreamSession uses canonical sstable instances

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 98ac45a8a -> 2595e74f6 refs/heads/cassandra-2.2 4aa56ec24 -> 2357589dd refs/heads/trunk 61aeb9109 -> 72bb4c0c9 Ensure StreamSession uses canonical sstable instances patch by benedict; reviewed by yukim for CASSA

[05/12] cassandra git commit: Eliminate strong self-reference chains in sstable ref tidiers

Eliminate strong self-reference chains in sstable ref tidiers patch by benedict; reviewed by branimir for CASSANDRA-9656 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2595e74f Tree: http://git-wip-us.apache.org

[04/12] cassandra git commit: Eliminate strong self-reference chains in sstable ref tidiers

Eliminate strong self-reference chains in sstable ref tidiers patch by benedict; reviewed by branimir for CASSANDRA-9656 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2595e74f Tree: http://git-wip-us.apache.org

[02/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

.org/repos/asf/cassandra/diff/4aa56ec2 Branch: refs/heads/trunk Commit: 4aa56ec2454931f2d34eaef51699c9b37ea8efcd Parents: 1411ad5 98ac45a Author: Benedict Elliott Smith Authored: Thu Jul 2 18:05:26 2015 +0100 Committer: Benedict Elliott Smith Committed: Thu Jul 2 18:05:26

[11/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

apache.org/repos/asf/cassandra/diff/2357589d Branch: refs/heads/cassandra-2.2 Commit: 2357589dd393be1614ed5156ce05674afc4d0921 Parents: 4aa56ec 2595e74 Author: Benedict Elliott Smith Authored: Thu Jul 2 19:14:39 2015 +0100 Committer: Benedict Elliott Smith Committed: Thu Jul 2 19:14:39

[10/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2357589d/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 1458461,000

[09/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2357589d/src/java/org/apache/cassandra/tools/StandaloneSplitter.java -- diff --cc src/java/org/apache/cassandra/tools/StandaloneSplitter.java index e881133,9c3c58b..4545ab6 ---

[08/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

apache.org/repos/asf/cassandra/diff/2357589d Branch: refs/heads/trunk Commit: 2357589dd393be1614ed5156ce05674afc4d0921 Parents: 4aa56ec 2595e74 Author: Benedict Elliott Smith Authored: Thu Jul 2 19:14:39 2015 +0100 Committer: Benedict Elliott Smith Committed: Thu Jul 2 19:14:39

[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

://git-wip-us.apache.org/repos/asf/cassandra/tree/72bb4c0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72bb4c0c Branch: refs/heads/trunk Commit: 72bb4c0c9fc3aa35e994bcb561898e82d5cf5d36 Parents: 61aeb91 2357589 Author: Benedict Elliott Smith Authored: Thu Jul 2 19:16:29 2015 +0100

[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2357589d/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 1458461,000

[03/12] cassandra git commit: Eliminate strong self-reference chains in sstable ref tidiers

Eliminate strong self-reference chains in sstable ref tidiers patch by benedict; reviewed by branimir for CASSANDRA-9656 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2595e74f Tree: http://git-wip-us.apache.org

[06/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2357589d/src/java/org/apache/cassandra/tools/StandaloneSplitter.java -- diff --cc src/java/org/apache/cassandra/tools/StandaloneSplitter.java index e881133,9c3c58b..4545ab6 ---

[1/6] cassandra git commit: Follow-up to CASSANDRA-9656, fixing: * DataTracker.getCurrentVersion * keyCache wiring * offline totalDiskSpaceUsed maintenance, affecting unit tests

repos/asf/cassandra/diff/ec320e8a Branch: refs/heads/cassandra-2.1 Commit: ec320e8a1dd01b547d2e2cb3f0d1b994e814bda0 Parents: ca40d11 Author: Benedict Elliott Smith Authored: Mon Jul 6 10:17:20 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:12:54 2

[2/6] cassandra git commit: Follow-up to CASSANDRA-9656, fixing: * DataTracker.getCurrentVersion * keyCache wiring * offline totalDiskSpaceUsed maintenance, affecting unit tests

: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec320e8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec320e8a Branch: refs/heads/cassandra-2.2 Commit: ec320e8a1dd01b547d2e2cb3f0d1b994e814bda0 Parents: ca40d11 Author: Benedict Elliott Smith Authored: Mon Jul 6 10:17:20 2015

[3/6] cassandra git commit: Follow-up to CASSANDRA-9656, fixing: * DataTracker.getCurrentVersion * keyCache wiring * offline totalDiskSpaceUsed maintenance, affecting unit tests

: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec320e8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec320e8a Branch: refs/heads/trunk Commit: ec320e8a1dd01b547d2e2cb3f0d1b994e814bda0 Parents: ca40d11 Author: Benedict Elliott Smith Authored: Mon Jul 6 10:17:20 2015 +0100

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

/repos/asf/cassandra/tree/1f430c53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f430c53 Branch: refs/heads/cassandra-2.2 Commit: 1f430c5392ec2bee5d13fb56f6de8260f35e72cc Parents: b7ae07e ec320e8 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:14:07 2015 +0100 Committer: Benedi

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/2d7fec94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d7fec94 Branch: refs/heads/trunk Commit: 2d7fec94f13dd8a7d2b14179fc89202413bdcbf7 Parents: 582ef4b 1f430c5 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:14:50 2015 +0100 Committer

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

/repos/asf/cassandra/tree/1f430c53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f430c53 Branch: refs/heads/trunk Commit: 1f430c5392ec2bee5d13fb56f6de8260f35e72cc Parents: b7ae07e ec320e8 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:14:07 2015 +0100 Committer: Benedict Ell

[3/6] cassandra git commit: fixup SSTableRewriterTest

/aa8a7b55 Branch: refs/heads/trunk Commit: aa8a7b5576417c0469417eace131f270afc29923 Parents: ec320e8 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:49:48 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:49:48 2015 +0100

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

.org/repos/asf/cassandra/diff/77a666c6 Branch: refs/heads/cassandra-2.2 Commit: 77a666c69eb947a5c94bf46ab5c7f639ef2e6391 Parents: 1f430c5 aa8a7b5 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:49:55 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:49:55

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

.org/repos/asf/cassandra/diff/77a666c6 Branch: refs/heads/trunk Commit: 77a666c69eb947a5c94bf46ab5c7f639ef2e6391 Parents: 1f430c5 aa8a7b5 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:49:55 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:49:55

[1/6] cassandra git commit: fixup SSTableRewriterTest

e8 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:49:48 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:49:48 2015 +0100 -- .../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 7 ++- 1 fil

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

/repos/asf/cassandra/diff/160296cd Branch: refs/heads/trunk Commit: 160296cd307681e736ac63d67891d9d2b01759e5 Parents: 2d7fec9 77a666c Author: Benedict Elliott Smith Authored: Mon Jul 6 12:50:03 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:50:03

[2/6] cassandra git commit: fixup SSTableRewriterTest

/aa8a7b55 Branch: refs/heads/cassandra-2.2 Commit: aa8a7b5576417c0469417eace131f270afc29923 Parents: ec320e8 Author: Benedict Elliott Smith Authored: Mon Jul 6 12:49:48 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 6 12:49:48 2015 +0100

[01/12] cassandra git commit: Scrub (recover) sstables even when -Index.db is missing

rg/repos/asf/cassandra/diff/452d6a44 Branch: refs/heads/cassandra-2.0 Commit: 452d6a445a6935d3e7d0e0fdf59e87d2a2ff95e7 Parents: 62714a9 Author: Stefania Alborghetti Authored: Mon Jun 15 16:49:03 2015 +0800 Committer: Benedict Elliott Smith Committed: Tue Jul 7 14:27:2

[02/12] cassandra git commit: Scrub (recover) sstables even when -Index.db is missing

/cassandra/tree/452d6a44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452d6a44 Branch: refs/heads/cassandra-2.1 Commit: 452d6a445a6935d3e7d0e0fdf59e87d2a2ff95e7 Parents: 62714a9 Author: Stefania Alborghetti Authored: Mon Jun 15 16:49:03 2015 +0800 Committer: Benedict Elliott Smith

[11/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

68 4c94ef2 Author: Benedict Elliott Smith Authored: Tue Jul 7 16:28:19 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:28:19 2015 +0100 -- CHANGES.txt | 5 ++ .../ca

[08/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebe18bb2/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 0cc425a,000

[05/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

3f 452d6a4 Author: Benedict Elliott Smith Authored: Tue Jul 7 16:27:58 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:27:58 2015 +0100 -- CHANGES.txt | 5 ++ .../ca

[07/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

6a4 Author: Benedict Elliott Smith Authored: Tue Jul 7 16:27:58 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:27:58 2015 +0100 -- CHANGES.txt | 5 ++ .../cassandra/db/

[06/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

3f 452d6a4 Author: Benedict Elliott Smith Authored: Tue Jul 7 16:27:58 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:27:58 2015 +0100 -- CHANGES.txt | 5 ++ .../ca

[12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

8bb Author: Benedict Elliott Smith Authored: Tue Jul 7 16:45:02 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:45:02 2015 +0100 -- CHANGES.txt | 3 ++ .../db/

[03/12] cassandra git commit: Scrub (recover) sstables even when -Index.db is missing

/cassandra/tree/452d6a44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452d6a44 Branch: refs/heads/cassandra-2.2 Commit: 452d6a445a6935d3e7d0e0fdf59e87d2a2ff95e7 Parents: 62714a9 Author: Stefania Alborghetti Authored: Mon Jun 15 16:49:03 2015 +0800 Committer: Benedict Elliott Smith

[10/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebe18bb2/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 0cc425a,000

[04/12] cassandra git commit: Scrub (recover) sstables even when -Index.db is missing

/cassandra/tree/452d6a44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452d6a44 Branch: refs/heads/trunk Commit: 452d6a445a6935d3e7d0e0fdf59e87d2a2ff95e7 Parents: 62714a9 Author: Stefania Alborghetti Authored: Mon Jun 15 16:49:03 2015 +0800 Committer: Benedict Elliott Smith Committed

[09/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

s: 7d31068 4c94ef2 Author: Benedict Elliott Smith Authored: Tue Jul 7 16:28:19 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 16:28:19 2015 +0100 -- CHANGES.txt | 5 ++ ...

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

/repos/asf/cassandra/diff/9423109d Branch: refs/heads/trunk Commit: 9423109de2c11ff88f9ba3b04292428d7c53e7f4 Parents: a8bb75a 0f5dd22 Author: Benedict Elliott Smith Authored: Tue Jul 7 17:02:22 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 17:02:22 2015 +0100 -- --

[1/3] cassandra git commit: Fix merge

://git-wip-us.apache.org/repos/asf/cassandra/tree/0f5dd225 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f5dd225 Branch: refs/heads/cassandra-2.2 Commit: 0f5dd225de6ae995ddbc6d8d099260ed6eabd501 Parents: ebe18bb Author: Benedict Elliott Smith Authored: Tue Jul 7 16:48:45 2015

[2/3] cassandra git commit: Fix merge

: refs/heads/trunk Commit: 0f5dd225de6ae995ddbc6d8d099260ed6eabd501 Parents: ebe18bb Author: Benedict Elliott Smith Authored: Tue Jul 7 16:48:45 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 7 17:01:33 2015 +0100

[1/3] cassandra git commit: Improve BTree

Repository: cassandra Updated Branches: refs/heads/trunk ffc7745cf -> 5250d7ffd http://git-wip-us.apache.org/repos/asf/cassandra/blob/5250d7ff/test/burn/org/apache/cassandra/utils/LongBTreeTest.java -- diff --git a/test/burn/or

[3/3] cassandra git commit: Improve BTree

Improve BTree patch by benedict; reviewed by branimir for CASSANDRA-9769 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5250d7ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5250d7ff Diff: http://git

[2/3] cassandra git commit: Improve BTree

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5250d7ff/src/java/org/apache/cassandra/utils/btree/BTreeSet.java -- diff --git a/src/java/org/apache/cassandra/utils/btree/BTreeSet.java b/src/java/org/apache/cassandra/utils/b

cassandra git commit: fix bad merge/rebase

dra/tree/4cea221f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cea221f Branch: refs/heads/trunk Commit: 4cea221f957fe6f35237895550d65c7d402d2cee Parents: 6c14c3a Author: Benedict Elliott Smith Authored: Wed Jul 15 11:43:25 2015 +0100 Committer: Benedict Elliott Smith Committed:

cassandra git commit: For CASSANDRA-9499, update to OHC 0.4 that allow deserialization directly from ByteBuffers

:54 2015 -0400 Committer: Benedict Elliott Smith Committed: Wed Jul 15 14:24:35 2015 +0100 -- build.xml | 6 +- lib/ohc-core-0.3.4.jar | Bin 145954 -> 0 bytes l

cassandra git commit: Simplify/optimise CFMetaData serialization

Repository: cassandra Updated Branches: refs/heads/trunk 376e552c4 -> 43c3ab445 Simplify/optimise CFMetaData serialization patch by benedict; reviewed by sylvain for CASSANDRA-9709 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

cassandra git commit: Introduce a more efficient MergeIterator

lly finishes in several times fewer comparisons and swaps than poll + offer. patch by branimir; reviewed by benedict for CASSANDRA-8915 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c29001b9 Tree: http://git-

[2/6] cassandra git commit: ninja fix heap usage ratio logging

/diff/b87103be Branch: refs/heads/cassandra-2.2 Commit: b87103befe6af24698a12c530cf7aa5df932bd39 Parents: 2d462c0 Author: Benedict Elliott Smith Authored: Mon Jul 20 12:52:11 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 20 12:52:17 2015 +0100

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

.org/repos/asf/cassandra/diff/8d87c282 Branch: refs/heads/cassandra-2.2 Commit: 8d87c28223b92ead4758c40c3f51771cdf586d97 Parents: e651fdd b87103b Author: Benedict Elliott Smith Authored: Mon Jul 20 12:52:26 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 20 12:52:26

[1/6] cassandra git commit: ninja fix heap usage ratio logging

: 2d462c0 Author: Benedict Elliott Smith Authored: Mon Jul 20 12:52:11 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 20 12:52:17 2015 +0100 -- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 fil

[3/6] cassandra git commit: ninja fix heap usage ratio logging

/diff/b87103be Branch: refs/heads/trunk Commit: b87103befe6af24698a12c530cf7aa5df932bd39 Parents: 2d462c0 Author: Benedict Elliott Smith Authored: Mon Jul 20 12:52:11 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Jul 20 12:52:17 2015 +0100

<    4   5   6   7   8   9   10   11   12   13   >