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

/repos/asf/cassandra/diff/058e9772 Branch: refs/heads/trunk Commit: 058e97720258de6248ce7636989d596b9ae897be Parents: ec2c050 990f478 Author: Benedict Elliott Smith Authored: Tue Feb 24 14:35:05 2015 + Committer: Benedict Elliott Smith Committed: Tue Feb 24 14:35:05

cassandra git commit: fix CRC32Ex unit test when JDK < 1.8

he.org/repos/asf/cassandra/tree/93b365cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93b365cd Branch: refs/heads/trunk Commit: 93b365cdcff34418bdac56473997f0a6d2b2aaaf Parents: b32ce68 Author: Benedict Elliott Smith Authored: Wed Mar 4 00:26:41 2015 + Committer: Benedict Elliott

[1/5] cassandra git commit: Remove cold_reads_to_omit from STCS

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 33a9adac8 -> 3c3fefa04 refs/heads/trunk b5b1af703 -> 20b62de80 Remove cold_reads_to_omit from STCS Patch by marcuse; reviewed by thobbs for CASSANDRA-8860 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/5] cassandra git commit: Make SSTableRewriter.abort() more robust to failure

Make SSTableRewriter.abort() more robust to failure patch by benedict; reviewed by branimir for CASSANDRA-8832 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c3fefa0 Tree: http://git-wip-us.apache.org/repos/asf

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

/cassandra/diff/20b62de8 Branch: refs/heads/trunk Commit: 20b62de80b27066d09372a824898febc794ad239 Parents: b5b1af7 3c3fefa Author: Benedict Elliott Smith Authored: Wed Mar 4 15:03:36 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 15:03:36

[3/5] cassandra git commit: Make SSTableRewriter.abort() more robust to failure

Make SSTableRewriter.abort() more robust to failure patch by benedict; reviewed by branimir for CASSANDRA-8832 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c3fefa0 Tree: http://git-wip-us.apache.org/repos/asf

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/20b62de8/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 4468d57,000

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

unk Commit: e473ce066129365fd6a5fe8ff3ffb8f292d7788d Parents: 20b62de f3c0e11 Author: Benedict Elliott Smith Authored: Wed Mar 4 15:18:00 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 15:18:00 2015 + -- C

[2/4] cassandra git commit: IndexSummaryBuilder utilises offheap memory, and shares data between each IndexSummary opened from it

IndexSummaryBuilder utilises offheap memory, and shares data between each IndexSummary opened from it patch by benedict; reviewed by ariel for CASSANDRA-8757 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3c0e11e

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473ce06/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java index 0186

[1/4] cassandra git commit: IndexSummaryBuilder utilises offheap memory, and shares data between each IndexSummary opened from it

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3c3fefa04 -> f3c0e11e2 refs/heads/trunk 20b62de80 -> e473ce066 IndexSummaryBuilder utilises offheap memory, and shares data between each IndexSummary opened from it patch by benedict; reviewed by ariel for CASSANDR

cassandra git commit: fix merge(s)

ree/034e0179 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/034e0179 Branch: refs/heads/trunk Commit: 034e0179b8da63e74e871030387948dd861beba6 Parents: e473ce0 Author: Benedict Elliott Smith Authored: Wed Mar 4 15:30:39 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 15

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/5346ce70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5346ce70 Branch: refs/heads/trunk Commit: 5346ce700cefd2d848e2507c87d03fd54e89424b Parents: 034e017 ec7fba4 Author: Benedict Elliott Smith Authored: Wed Mar 4 16:07:34 2015 + Committer

[1/3] cassandra git commit: markCompacting only succeeds if the exact SSTableReader instances being marked are in the live set

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 f3c0e11e2 -> ec7fba44e refs/heads/trunk 034e0179b -> 5346ce700 markCompacting only succeeds if the exact SSTableReader instances being marked are in the live set patch by benedict; reviewed by tjake for CASSANDR

[2/3] cassandra git commit: markCompacting only succeeds if the exact SSTableReader instances being marked are in the live set

markCompacting only succeeds if the exact SSTableReader instances being marked are in the live set patch by benedict; reviewed by tjake for CASSANDRA-8689 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec7fba44 Tree

[1/3] cassandra git commit: Fix CASSANDRA-8750's treatment of compressed files

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ec7fba44e -> a1e2978f9 refs/heads/trunk 5346ce700 -> 36bd31d05 Fix CASSANDRA-8750's treatment of compressed files patch by benedict; reviewed by marcus for CASSANDRA-8750 Project: http://git-wip-us.apache.or

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

/repos/asf/cassandra/diff/a4221b72 Branch: refs/heads/trunk Commit: a4221b7213b398bdd252106ef507ff6312c5dc1f Parents: 36bd31d 7712e0e Author: Benedict Elliott Smith Authored: Wed Mar 4 16:44:42 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 16:44:42

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

978 Author: Benedict Elliott Smith Authored: Wed Mar 4 16:31:59 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 16:31:59 2015 + -- .../compress/CompressedRandomAccessReader.java | 8 + .../i

[2/3] cassandra git commit: Fix CASSANDRA-8750's treatment of compressed files

Fix CASSANDRA-8750's treatment of compressed files patch by benedict; reviewed by marcus for CASSANDRA-8750 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1e2978f Tree: http://git-wip-us.apache.org/repo

[2/3] cassandra git commit: cassandra-stress support for varint

cassandra-stress support for varint patch by sebastian estevez; reviewed by benedict for CASSANDRA-8882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7712e0ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] cassandra git commit: cassandra-stress support for varint

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a1e2978f9 -> 7712e0ef0 refs/heads/trunk 36bd31d05 -> a4221b721 cassandra-stress support for varint patch by sebastian estevez; reviewed by benedict for CASSANDRA-8882 Project: http://git-wip-us.apache.org/repos/asf/cas

cassandra git commit: fix merge

ree/7376f42f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7376f42f Branch: refs/heads/trunk Commit: 7376f42fc183bde6a03f1d94e04556d90ef6e525 Parents: a4221b7 Author: Benedict Elliott Smith Authored: Wed Mar 4 17:08:16 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4 17:08

cassandra git commit: fix test merge

ree/8501e518 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8501e518 Branch: refs/heads/trunk Commit: 8501e51868727acea74e195bfe777b5e96da39d7 Parents: 7376f42 Author: Benedict Elliott Smith Authored: Wed Mar 4 17:24:27 2015 + Committer: Benedict Elliott Smith Committed: Wed Mar 4

[1/3] cassandra git commit: Fix Adler32 digest for compressed sstables

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 59ed491ac -> 0e621317e refs/heads/trunk 56e190b1c -> 3fededce1 Fix Adler32 digest for compressed sstables patch by jeff jirsa; reviewed by benedict for CASSANDRA-8778 Project: http://git-wip-us.apache.org/repos/asf/cas

[2/3] cassandra git commit: Fix Adler32 digest for compressed sstables

Fix Adler32 digest for compressed sstables patch by jeff jirsa; reviewed by benedict for CASSANDRA-8778 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e621317 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] cassandra git commit: nit remove redundant int cast

commit/4ce409e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ce409e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ce409e3 Branch: refs/heads/cassandra-2.1 Commit: 4ce409e33ffce7b0976d95b66b0a43c68f2a7d88 Parents: 0e62131 Author: Benedict Elliott Smith Authored: Thu Mar 5

[2/3] cassandra git commit: nit remove redundant int cast

/4ce409e3 Branch: refs/heads/trunk Commit: 4ce409e33ffce7b0976d95b66b0a43c68f2a7d88 Parents: 0e62131 Author: Benedict Elliott Smith Authored: Thu Mar 5 20:07:14 2015 + Committer: Benedict Elliott Smith Committed: Thu Mar 5 20:07:14 2015 +

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

/repos/asf/cassandra/diff/3fededce Branch: refs/heads/trunk Commit: 3fededce1bbfc4fff320c058bcf0a97ca6124a20 Parents: 56e190b 0e62131 Author: Benedict Elliott Smith Authored: Thu Mar 5 20:05:25 2015 + Committer: Benedict Elliott Smith Committed: Thu Mar 5 20:05:25

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

/repos/asf/cassandra/diff/f6d8d88c Branch: refs/heads/trunk Commit: f6d8d88ce3b54e3afdc41b30e2055d974594ac0c Parents: 3fededc 4ce409e Author: Benedict Elliott Smith Authored: Thu Mar 5 20:07:19 2015 + Committer: Benedict Elliott Smith Committed: Thu Mar 5 20:07:19

cassandra git commit: Optimise (Time)?UUIDType comparisons

Repository: cassandra Updated Branches: refs/heads/trunk dce6033d8 -> 6d266253a Optimise (Time)?UUIDType comparisons patch by benedict; reviewed by ariel for CASSANDRA-8730 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

cassandra git commit: Avoid memory allocation when searching index summary

Repository: cassandra Updated Branches: refs/heads/trunk 6d266253a -> bf9c50313 Avoid memory allocation when searching index summary patch by benedict; reviewed by ariel for CASSANDRA-8793 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

cassandra git commit: cassandra-stress prints per operation statistics, plus misc other stress updates

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ef6fa3733 -> 6bbfb5574 cassandra-stress prints per operation statistics, plus misc other stress updates patch by anthony cozzie, reviewed by benedict for CASSANDRA-8769 Project: http://git-wip-us.apache.org/repos/asf/cassan

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

://git-wip-us.apache.org/repos/asf/cassandra/tree/a0586f69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0586f69 Branch: refs/heads/trunk Commit: a0586f69291af79079db0f5cc495806a28fca7a6 Parents: bf9c503 6bbfb55 Author: Benedict Elliott Smith Authored: Tue Mar 10 14:26:30 2015 +

[1/2] cassandra git commit: cassandra-stress prints per operation statistics, plus misc other stress updates

Repository: cassandra Updated Branches: refs/heads/trunk bf9c50313 -> a0586f692 cassandra-stress prints per operation statistics, plus misc other stress updates patch by anthony cozzie, reviewed by benedict for CASSANDRA-8769 Project: http://git-wip-us.apache.org/repos/asf/cassandra/r

cassandra git commit: include missing files

dra/tree/b7563f82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7563f82 Branch: refs/heads/trunk Commit: b7563f823ed5cacd553721016ab4609e85685afd Parents: a0586f6 Author: Benedict Elliott Smith Authored: Tue Mar 10 17:12:31 2015 + Committer: Benedict Elliott Smith Committed:

[2/3] cassandra git commit: include missing files

Branch: refs/heads/trunk Commit: 97d65d6d3689ef3fd47d760004377486ad00d631 Parents: 6bbfb55 Author: Benedict Elliott Smith Authored: Tue Mar 10 17:13:46 2015 + Committer: Benedict Elliott Smith Committed: Tue Mar 10 17:13:46 2015 +

[2/3] cassandra git commit: ninja fix cassandra-stress rank latencies

/cassandra/diff/81fe1a2a Branch: refs/heads/trunk Commit: 81fe1a2a86772512945a2b19a7b968a3fd1295f4 Parents: 97d65d6 Author: Benedict Elliott Smith Authored: Tue Mar 10 17:43:06 2015 + Committer: Benedict Elliott Smith Committed: Tue Mar 10 17:43:06 2015 +

[1/3] cassandra git commit: ninja fix cassandra-stress rank latencies

sandra/commit/81fe1a2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81fe1a2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81fe1a2a Branch: refs/heads/cassandra-2.1 Commit: 81fe1a2a86772512945a2b19a7b968a3fd1295f4 Parents: 97d65d6 Author: Benedict Elliott Smith Authore

cassandra git commit: merge UUIDType and TimeUUIDType parse logic

Repository: cassandra Updated Branches: refs/heads/trunk e585c339d -> d76adf500 merge UUIDType and TimeUUIDType parse logic patch by benedict; reviewed by ariel for CASSANDRA-8759 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

[12/15] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

75 Branch: refs/heads/trunk Commit: 77d0c175743c8c063282ba54d4dccd8a1676ebcb Parents: 9aff086 0580fb2 Author: Benedict Elliott Smith Authored: Sun Sep 7 21:23:52 2014 +0700 Committer: Benedict Elliott Smith Committed: Sun Sep 7 21:23:52

[09/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.

[15/15] git commit: fixup

/heads/trunk Commit: eec381e0d658cc467b75d1abc0d8a89de9826e04 Parents: b170b3c Author: Benedict Elliott Smith Authored: Sun Sep 7 21:32:55 2014 +0700 Committer: Benedict Elliott Smith Committed: Sun Sep 7 21:32:55 2014 +0700

[05/15] git commit: Improve stress workload realism

Improve stress workload realism patch by benedict; reviewed by tjake for CASSANDRA-7519 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0580fb2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0580fb2b

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

c17 Author: Benedict Elliott Smith Authored: Sun Sep 7 21:32:36 2014 +0700 Committer: Benedict Elliott Smith Committed: Sun Sep 7 21:32:36 2014 +0700 -- CHANGES.txt | 3 +

[13/15] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

75 Branch: refs/heads/cassandra-2.1 Commit: 77d0c175743c8c063282ba54d4dccd8a1676ebcb Parents: 9aff086 0580fb2 Author: Benedict Elliott Smith Authored: Sun Sep 7 21:23:52 2014 +0700 Committer: Benedict Elliott Smith Committed: Sun Sep 7 21:23:52

[07/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java b/tools/

[10/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java b/tools/

[02/15] git commit: Update versions and NEWS file for 2.1.0 release

Update versions and NEWS file for 2.1.0 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6a2c65a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6a2c65a Diff: http://git-wip-us.apache.org/repos/asf

[01/15] git commit: Update versions and NEWS file for 2.1.0 release

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9aff086a4 -> 77d0c1757 refs/heads/cassandra-2.1.0 c6a2c65a7 -> 0580fb2b7 refs/heads/trunk 131097c2c -> eec381e0d Update versions and NEWS file for 2.1.0 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

[11/15] git commit: Improve stress workload realism

Improve stress workload realism patch by benedict; reviewed by tjake for CASSANDRA-7519 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0580fb2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0580fb2b

[06/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.

[04/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/SeedManager.java b/tools/

[08/15] git commit: Improve stress workload realism

Improve stress workload realism patch by benedict; reviewed by tjake for CASSANDRA-7519 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0580fb2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0580fb2b

[03/15] Improve stress workload realism

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0580fb2b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java -- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.

[2/3] git commit: fix merge of 7519

Branch: refs/heads/trunk Commit: a44d641e8ff877be7f758221d125c7b94d6fd1e4 Parents: 77d0c17 Author: Benedict Elliott Smith Authored: Mon Sep 8 08:06:36 2014 +0700 Committer: Benedict Elliott Smith Committed: Mon Sep 8 08:06:36 2014 +0700

[1/3] git commit: fix merge of 7519

e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44d641e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44d641e Branch: refs/heads/cassandra-2.1 Commit: a44d641e8ff877be7f758221d125c7b94d6fd1e4 Parents: 77d0c17 Author: Benedict Elliott Smith Authored: Mon Sep 8 08:06:3

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

/repos/asf/cassandra/diff/f203f0f3 Branch: refs/heads/trunk Commit: f203f0f3f9506736e3cc3309a67182a413fa575c Parents: eec381e a44d641 Author: Benedict Elliott Smith Authored: Mon Sep 8 08:06:45 2014 +0700 Committer: Benedict Elliott Smith Committed: Mon Sep 8 08:06:45 2014 +0700 -- --

git commit: Permit use of custom allocator for memtables

Repository: cassandra Updated Branches: refs/heads/trunk f34e829a2 -> d641053ab Permit use of custom allocator for memtables patch by Jay Patel; reviewed by benedict for CASSANDRA-7883 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[1/6] git commit: In RowDataResolver, reduce calls to replies.size(), and use replies.peek() instead of replies.iterator().next()

efs/heads/cassandra-2.1 Commit: f099e086f3f002789e24bd6c58e52b7553cd5381 Parents: 852f084 Author: Benedict Elliott Smith Authored: Tue Sep 9 09:36:14 2014 +0700 Committer: Benedict Elliott Smith Committed: Tue Sep 9 09:38:16 2

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

.org/repos/asf/cassandra/diff/bbbdec63 Branch: refs/heads/trunk Commit: bbbdec63a419018cfb77732a55c66e140e7ce955 Parents: 4bdbdc1 f099e08 Author: Benedict Elliott Smith Authored: Tue Sep 9 09:38:29 2014 +0700 Committer: Benedict Elliott Smith Committed: Tue Sep 9 09:38:29

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

.org/repos/asf/cassandra/commit/691d5308 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/691d5308 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/691d5308 Branch: refs/heads/trunk Commit: 691d5308a7b07418cef5eee7f06f0ca03f639a4b Parents: 1198df4 bbbdec6 Author: Benedict Ell

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

.org/repos/asf/cassandra/diff/bbbdec63 Branch: refs/heads/cassandra-2.1 Commit: bbbdec63a419018cfb77732a55c66e140e7ce955 Parents: 4bdbdc1 f099e08 Author: Benedict Elliott Smith Authored: Tue Sep 9 09:38:29 2014 +0700 Committer: Benedict Elliott Smith Committed: Tue Sep 9 09:38:29

[2/6] git commit: In RowDataResolver, reduce calls to replies.size(), and use replies.peek() instead of replies.iterator().next()

/cassandra/tree/f099e086 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f099e086 Branch: refs/heads/cassandra-2.1.0 Commit: f099e086f3f002789e24bd6c58e52b7553cd5381 Parents: 852f084 Author: Benedict Elliott Smith Authored: Tue Sep 9 09:36:14 2014 +0700 Committer: Benedict Elliott Smith

[3/6] git commit: In RowDataResolver, reduce calls to replies.size(), and use replies.peek() instead of replies.iterator().next()

/cassandra/tree/f099e086 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f099e086 Branch: refs/heads/trunk Commit: f099e086f3f002789e24bd6c58e52b7553cd5381 Parents: 852f084 Author: Benedict Elliott Smith Authored: Tue Sep 9 09:36:14 2014 +0700 Committer: Benedict Elliott Smith Committed

git commit: Introduce new append-only concurrent collection, Accumulator, and use for AbstractRowResolver.replies

Repository: cassandra Updated Branches: refs/heads/trunk 691d5308a -> b86705027 Introduce new append-only concurrent collection, Accumulator, and use for AbstractRowResolver.replies patch by benedict; reviewed by mishail for CASSANDRA-7873 Project: http://git-wip-us.apache.org/repos/

[1/3] git commit: cassandra-stress: merge 7468 into 2.1, and ninja-fix duration setting for user command

fb32ba Author: Benedict Elliott Smith Authored: Thu Sep 11 11:27:34 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Sep 11 11:27:34 2014 +0700 -- .../apache/cassandra/stress/StressAction.java | 22 -- .../

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

/repos/asf/cassandra/diff/51a6f0f7 Branch: refs/heads/trunk Commit: 51a6f0f7facb4eed17d34702f9527ac7fd1aef75 Parents: e775254 530c9f5 Author: Benedict Elliott Smith Authored: Thu Sep 11 11:28:36 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Sep 11 11:28:36

[2/3] git commit: cassandra-stress: merge 7468 into 2.1, and ninja-fix duration setting for user command

Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/530c9f52 Branch: refs/heads/trunk Commit: 530c9f52c341fccfc8744307c359566697e54a0a Parents: 5fb32ba Author: Benedict Elliott Smith Authored: Thu Sep 11 11:27:34 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Sep 11 11:27:34

[2/3] git commit: cassandra-stress: ninja fix profile param for user command to required, and print required fields first

/tree/73b2dcc1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73b2dcc1 Branch: refs/heads/trunk Commit: 73b2dcc165155fd90ecc978c7281276e536d317d Parents: 530c9f5 Author: Benedict Elliott Smith Authored: Thu Sep 11 12:35:29 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu

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

/repos/asf/cassandra/diff/1963b7f0 Branch: refs/heads/trunk Commit: 1963b7f032b2faf31f6bda545330e8146a44ea45 Parents: 51a6f0f 73b2dcc Author: Benedict Elliott Smith Authored: Thu Sep 11 12:36:08 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Sep 11 12:36:08

[1/3] git commit: cassandra-stress: ninja fix profile param for user command to required, and print required fields first

6d317d Parents: 530c9f5 Author: Benedict Elliott Smith Authored: Thu Sep 11 12:35:29 2014 +0700 Committer: Benedict Elliott Smith Committed: Thu Sep 11 12:35:29 2014 +0700 -- .../cassandra/stress/settings/GroupedOptions.java

[2/3] git commit: GCInspector more closely tracks GC; cassandra-stress and nodetool report it

GCInspector more closely tracks GC; cassandra-stress and nodetool report it patch by benedict; reviewed by tjake Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e652e75 Tree: http://git-wip-us.apache.org/repos/asf

[1/3] git commit: GCInspector more closely tracks GC; cassandra-stress and nodetool report it

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d002c7edc -> 0e652e754 refs/heads/trunk 080816637 -> 477c54c03 GCInspector more closely tracks GC; cassandra-stress and nodetool report it patch by benedict; reviewed by tjake Project: http://git-wip-us.apache.org/rep

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

/repos/asf/cassandra/diff/477c54c0 Branch: refs/heads/trunk Commit: 477c54c03cb708911d2173a0730b189ad844e2da Parents: 0808166 0e652e7 Author: Benedict Elliott Smith Authored: Sun Sep 14 09:09:57 2014 +0100 Committer: Benedict Elliott Smith Committed: Sun Sep 14 09:09:57

[2/3] git commit: cassandra-stress supports whitelist mode for node config

cassandra-stress supports whitelist mode for node config patch by benedict; reviewed by tjake for CASSANDRA-7658 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eea042b0 Tree: http://git-wip-us.apache.org/repos/asf

[1/3] git commit: cassandra-stress supports whitelist mode for node config

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 0e652e754 -> eea042b0b refs/heads/trunk 477c54c03 -> 14b1c9607 cassandra-stress supports whitelist mode for node config patch by benedict; reviewed by tjake for CASSANDRA-7658 Project: http://git-wip-us.apache.org/rep

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

/repos/asf/cassandra/diff/14b1c960 Branch: refs/heads/trunk Commit: 14b1c96072dfdfccb8c1a2c10e8feb4b8189846f Parents: 477c54c eea042b Author: Benedict Elliott Smith Authored: Sun Sep 14 09:13:44 2014 +0100 Committer: Benedict Elliott Smith Committed: Sun Sep 14 09:13:44

[1/3] git commit: ninja fix rethrow InterruptedException in cassandra-stress Timing.snap

it-wip-us.apache.org/repos/asf/cassandra/commit/a6678a27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6678a27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6678a27 Branch: refs/heads/cassandra-2.1 Commit: a6678a273d61b4db54e0b7afeeab8b1b0f7d82a1 Parents: eea042b Author: Be

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

/repos/asf/cassandra/diff/58985409 Branch: refs/heads/trunk Commit: 58985409c9e7883bd1362687413771dcbc90ccf7 Parents: 14b1c96 a6678a2 Author: Benedict Elliott Smith Authored: Sun Sep 14 13:51:08 2014 +0100 Committer: Benedict Elliott Smith Committed: Sun Sep 14 13:51:08

[2/3] git commit: ninja fix rethrow InterruptedException in cassandra-stress Timing.snap

-us.apache.org/repos/asf/cassandra/diff/a6678a27 Branch: refs/heads/trunk Commit: a6678a273d61b4db54e0b7afeeab8b1b0f7d82a1 Parents: eea042b Author: Benedict Elliott Smith Authored: Sun Sep 14 13:50:38 2014 +0100 Committer: Benedict Elliott Smith Committed: Sun Sep 14 13:50:38 2014 +0100

[3/5] git commit: ninja-fix CHANGES.txt

Branch: refs/heads/trunk Commit: 1d7691e251e3d170916f138b0980d6a9003cf7db Parents: 028880e Author: Benedict Elliott Smith Authored: Mon Sep 15 14:57:46 2014 +0100 Committer: Benedict Elliott Smith Committed: Mon Sep 15 15:02:32 2014 +0100

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

://git-wip-us.apache.org/repos/asf/cassandra/commit/35af28e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35af28e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35af28e5 Branch: refs/heads/trunk Commit: 35af28e550cd80be7df36283fe283454977a2a37 Parents: e225176 1d7691e Author

[2/5] git commit: Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom

Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom patch by benedict; reviewed by tjake for CASSANDRA-7934 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/028880e7 Tree: http://git-wip-us.apache.org/repos

[4/5] git commit: ninja-fix CHANGES.txt

Branch: refs/heads/cassandra-2.1 Commit: 1d7691e251e3d170916f138b0980d6a9003cf7db Parents: 028880e Author: Benedict Elliott Smith Authored: Mon Sep 15 14:57:46 2014 +0100 Committer: Benedict Elliott Smith Committed: Mon Sep 15 15:02:32 2014 +0100

[1/5] git commit: Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 094aa8ef2 -> 1d7691e25 refs/heads/trunk e225176b3 -> 35af28e55 Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom patch by benedict; reviewed by tjake for CASSANDRA-7934 Project: http://git-wip-us.apac

[1/3] git commit: ninja-fix cassandra-stress totalGcStats metric

os/asf/cassandra/commit/6bff5a33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bff5a33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bff5a33 Branch: refs/heads/cassandra-2.1 Commit: 6bff5a3318c46d09f1338665d0d0251bf5bda3a1 Parents: 1d7691e Author: Benedict Elliott Smith Au

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

/repos/asf/cassandra/diff/969967cf Branch: refs/heads/trunk Commit: 969967cf9f5597a32d1a8d2575434f8088add87e Parents: 35af28e 6bff5a3 Author: Benedict Elliott Smith Authored: Mon Sep 15 16:56:50 2014 +0100 Committer: Benedict Elliott Smith Committed: Mon Sep 15 16:56:50

[2/3] git commit: ninja-fix cassandra-stress totalGcStats metric

/cassandra/diff/6bff5a33 Branch: refs/heads/trunk Commit: 6bff5a3318c46d09f1338665d0d0251bf5bda3a1 Parents: 1d7691e Author: Benedict Elliott Smith Authored: Mon Sep 15 16:56:45 2014 +0100 Committer: Benedict Elliott Smith Committed: Mon Sep 15 16:56:45 2014 +0100

[2/3] git commit: ninja fix cassandra-stress pre-2.1.1 compatibility

/asf/cassandra/diff/4efb6dc8 Branch: refs/heads/trunk Commit: 4efb6dc8c13e56b4d93ac7799a6edaa7dfc07e6f Parents: 1ba9593 Author: Benedict Elliott Smith Authored: Tue Sep 16 06:28:01 2014 +0100 Committer: Benedict Elliott Smith Committed: Tue Sep 16 06:28:01 2014 +0100

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

/repos/asf/cassandra/diff/7fc0e9ef Branch: refs/heads/trunk Commit: 7fc0e9efead0752532f492c9396c602a9d9fd0a1 Parents: ff60429 4efb6dc Author: Benedict Elliott Smith Authored: Tue Sep 16 06:29:00 2014 +0100 Committer: Benedict Elliott Smith Committed: Tue Sep 16 06:29:00

[1/3] git commit: ninja fix cassandra-stress pre-2.1.1 compatibility

os/asf/cassandra/commit/4efb6dc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4efb6dc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4efb6dc8 Branch: refs/heads/cassandra-2.1 Commit: 4efb6dc8c13e56b4d93ac7799a6edaa7dfc07e6f Parents: 1ba9593 Author: Benedict Elliott

[2/3] git commit: cassandra-stress: fix support for NetworkTopologyStrategy

cassandra-stress: fix support for NetworkTopologyStrategy patch by benedict; reviewed by yukim for CASSANDRA-7945 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/109313c3 Tree: http://git-wip-us.apache.org/repos/asf

[1/3] git commit: cassandra-stress: fix support for NetworkTopologyStrategy

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b319b406b -> 109313c3e refs/heads/trunk 61a27af49 -> 8215744ff cassandra-stress: fix support for NetworkTopologyStrategy patch by benedict; reviewed by yukim for CASSANDRA-7945 Project: http://git-wip-us.apache.org/rep

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

/repos/asf/cassandra/diff/8215744f Branch: refs/heads/trunk Commit: 8215744ffb38d496d878e4c1705d066d3ff314e0 Parents: 61a27af 109313c Author: Benedict Elliott Smith Authored: Tue Sep 16 20:48:57 2014 +0100 Committer: Benedict Elliott Smith Committed: Tue Sep 16 20:48:57

[1/3] git commit: Fix resource leak in event of corrupt sstable

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c5c0585b4 -> 0e8310077 refs/heads/trunk 3e305f809 -> 0956a8a71 Fix resource leak in event of corrupt sstable patch by benedict; review by yukim for CASSANDRA-7932 Project: http://git-wip-us.apache.org/repos/asf/cas

[2/3] git commit: Fix resource leak in event of corrupt sstable

Fix resource leak in event of corrupt sstable patch by benedict; review by yukim for CASSANDRA-7932 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e831007 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

://git-wip-us.apache.org/repos/asf/cassandra/commit/0956a8a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0956a8a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0956a8a7 Branch: refs/heads/trunk Commit: 0956a8a717781c8a748931f04a18a215d7d53869 Parents: 3e305f8 0e83100 Author

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

/repos/asf/cassandra/diff/77625187 Branch: refs/heads/trunk Commit: 77625187458beaadd8f964f8efba72292c012244 Parents: cfb7ace eecc034 Author: Benedict Elliott Smith Authored: Sat Sep 20 08:44:43 2014 +0100 Committer: Benedict Elliott Smith Committed: Sat Sep 20 08:44:43

[1/3] git commit: ninja-fix stress: rate limit not honoured for warmup, and 'auto' rate mode optional with thread ranges

5cbc4c7a1e4f0902 Parents: 6e5dd23 Author: Benedict Elliott Smith Authored: Sat Sep 20 08:44:37 2014 +0100 Committer: Benedict Elliott Smith Committed: Sat Sep 20 08:44:37 2014 +0100 -- .../apache/cassandra/stress/StressAc

[2/3] git commit: ninja-fix stress: rate limit not honoured for warmup, and 'auto' rate mode optional with thread ranges

/cassandra/tree/eecc034b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eecc034b Branch: refs/heads/trunk Commit: eecc034b686b4f2998fbc8045cbc4c7a1e4f0902 Parents: 6e5dd23 Author: Benedict Elliott Smith Authored: Sat Sep 20 08:44:37 2014 +0100 Committer: Benedict Elliott Smith Committe

<    2   3   4   5   6   7   8   9   10   11   >