[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-06-30 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3a1ba6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3a1ba6 Diff:

[05/10] git commit: Upgrade to snappy-java 1.0.5.2

2014-06-30 Thread jbellis
Upgrade to snappy-java 1.0.5.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c23eccf3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c23eccf3 Diff:

[09/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-06-30 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3a1ba6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3a1ba6 Diff:

[04/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-30 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d714d631 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d714d631 Diff:

[02/10] git commit: Split out outgoing stream throughput within a DC and inter-DC patch by Vijay and benedict for CASSANDRA-6596

2014-06-30 Thread jbellis
Split out outgoing stream throughput within a DC and inter-DC patch by Vijay and benedict for CASSANDRA-6596 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4112a7fa Tree:

[06/10] git commit: Upgrade to snappy-java 1.0.5.2

2014-06-30 Thread jbellis
Upgrade to snappy-java 1.0.5.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c23eccf3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c23eccf3 Diff:

[06/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd6a766f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd6a766f Diff:

[05/11] git commit: close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459

2014-06-27 Thread jbellis
close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/536ae7ae Tree: http://git-wip-us.apache.org/repos/asf

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

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0494e8f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0494e8f2 Diff:

[09/11] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c148e2ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c148e2ad Diff:

[04/11] git commit: close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459

2014-06-27 Thread jbellis
close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/536ae7ae Tree: http://git-wip-us.apache.org/repos/asf

[01/11] git commit: Properly handle unrecognized opcodes and flags

2014-06-27 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 e32423159 - 536ae7ae9 refs/heads/cassandra-2.1 12c694edb - c148e2ada refs/heads/cassandra-2.1.0 8aa2b791d - bd6a766f9 refs/heads/trunk da1981cc4 - 0494e8f27 Properly handle unrecognized opcodes and flags Patch by Tyler

[02/11] git commit: close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459

2014-06-27 Thread jbellis
close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/536ae7ae Tree: http://git-wip-us.apache.org/repos/asf

[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd6a766f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd6a766f Diff:

[10/11] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c148e2ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c148e2ad Diff:

[07/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-27 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd6a766f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd6a766f Diff:

[03/11] git commit: close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459

2014-06-27 Thread jbellis
close CqlRecordWriter clients when finished patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/536ae7ae Tree: http://git-wip-us.apache.org/repos/asf

[3/6] git commit: (Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451

2014-06-27 Thread jbellis
(Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8ee9da1 Tree:

[5/6] git commit: merge from 2.1.0

2014-06-27 Thread jbellis
merge from 2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7dbdd89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dbdd89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dbdd89

[6/6] git commit: merge from 2.1.0

2014-06-27 Thread jbellis
merge from 2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e7ed617 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e7ed617 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e7ed617

[2/6] git commit: (Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451

2014-06-27 Thread jbellis
(Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8ee9da1 Tree:

[4/6] git commit: merge from 2.1.0

2014-06-27 Thread jbellis
merge from 2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7dbdd89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dbdd89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dbdd89

[1/6] git commit: (Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451

2014-06-27 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c148e2ada - e7dbdd894 refs/heads/cassandra-2.1.0 bd6a766f9 - b8ee9da1e refs/heads/trunk 0494e8f27 - 8e7ed6175 (Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451 Project:

git commit: fix build on os x

2014-06-27 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/trunk 73d517d6d - c027183ea fix build on os x Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c027183e Tree:

[1/3] git commit: Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278

2014-06-26 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 ac1d5bd56 - 900f29c7f refs/heads/cassandra-2.1 e8500c72c - c18e740c8 Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278 Project: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278

2014-06-26 Thread jbellis
Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/900f29c7 Tree: http://git-wip-us.apache.org/repos/asf

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

2014-06-26 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c18e740c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18e740c Diff:

[5/8] git commit: Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345

2014-06-26 Thread jbellis
Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[7/8] git commit: merge from 2.0

2014-06-26 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8aa2b791 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8aa2b791 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8aa2b791

[1/8] git commit: Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278

2014-06-26 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 900f29c7f - 2b973b9ed refs/heads/cassandra-2.1 c18e740c8 - 8aa2b791d refs/heads/trunk 652a7ea71 - beea5d68c Fix race in FileCacheService RemovalListener patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278 Project

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

2014-06-26 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c18e740c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18e740c Diff:

[3/8] git commit: Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345

2014-06-26 Thread jbellis
Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

2014-06-26 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/beea5d68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beea5d68 Diff:

[4/8] git commit: Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345

2014-06-26 Thread jbellis
Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[6/8] git commit: merge from 2.0

2014-06-26 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8aa2b791 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8aa2b791 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8aa2b791

[1/3] git commit: clean out in_memory_compaction_limit patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428

2014-06-24 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a224e583a - 1569bd9c4 refs/heads/trunk 18f062cf0 - 005835e08 clean out in_memory_compaction_limit patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

[2/3] git commit: clean out in_memory_compaction_limit patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428

2014-06-24 Thread jbellis
clean out in_memory_compaction_limit patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1569bd9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2014-06-24 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/005835e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/005835e0 Diff:

[4/5] git commit: Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1

2014-06-23 Thread jbellis
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a175f70f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a175f70f Diff:

[2/5] git commit: Revert add file:/// on Windows to -Dcassandra.config value

2014-06-23 Thread jbellis
Revert add file:/// on Windows to -Dcassandra.config value This reverts commit 498ee24b52a6876a008c3d3d3ef4870e4bd9842c. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2420cb46 Tree:

[5/5] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

2014-06-23 Thread jbellis
Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2941791a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2941791a Diff:

[1/5] git commit: Revert add file:/// on Windows to -Dcassandra.config value

2014-06-23 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 bf9b49ca8 - a175f70fa refs/heads/trunk c1ce969c6 - 2941791a1 Revert add file:/// on Windows to -Dcassandra.config value This reverts commit 498ee24b52a6876a008c3d3d3ef4870e4bd9842c. Project:

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

2014-06-23 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6921af28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6921af28 Diff:

[2/3] git commit: dedup CHANGES

2014-06-23 Thread jbellis
dedup CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25baf713 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25baf713 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25baf713 Branch:

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

2014-06-23 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdb35512 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdb35512 Diff:

[1/3] git commit: dedup CHANGES

2014-06-23 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c33e77ae7 - 25baf713d refs/heads/trunk cdf08084d - fdb35512d dedup CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25baf713 Tree:

[3/6] git commit: revert #7275

2014-06-20 Thread jbellis
revert #7275 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93f54fc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f54fc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f54fc4 Branch:

[6/6] git commit: merge from 2.0

2014-06-20 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7ad9d2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7ad9d2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7ad9d2a

[2/6] git commit: revert #7275

2014-06-20 Thread jbellis
revert #7275 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93f54fc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f54fc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f54fc4 Branch:

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

2014-06-20 Thread jbellis
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90058a97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90058a97 Diff:

[1/6] git commit: revert #7275

2014-06-20 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 cccdcb5da - 93f54fc44 refs/heads/cassandra-2.0 9da742d5f - 90058a97a refs/heads/cassandra-2.1 9dcdb8b0b - a7ad9d2a5 revert #7275 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-06-20 Thread jbellis
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90058a97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90058a97 Diff:

[1/3] git commit: fix heap size on Windows 32bit VM patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353

2014-06-18 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9d6afb4b7 - d6322a7ec refs/heads/trunk dee30cc63 - 340ce90e9 fix heap size on Windows 32bit VM patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353 Project:

[2/3] git commit: fix heap size on Windows 32bit VM patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353

2014-06-18 Thread jbellis
fix heap size on Windows 32bit VM patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6322a7e Tree:

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

2014-06-18 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/340ce90e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/340ce90e Diff:

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

2014-06-18 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba83acd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba83acd0 Diff:

[2/3] git commit: add file:/// on Windows to -Dcassandra.config value patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398

2014-06-18 Thread jbellis
add file:/// on Windows to -Dcassandra.config value patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/498ee24b Tree:

[1/3] git commit: add file:/// on Windows to -Dcassandra.config value patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398

2014-06-18 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d6322a7ec - 498ee24b5 refs/heads/trunk 340ce90e9 - ba83acd02 add file:/// on Windows to -Dcassandra.config value patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398 Project:

[2/3] git commit: return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335

2014-06-12 Thread jbellis
return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa601bdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-06-12 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac75774d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac75774d Diff:

[1/3] git commit: return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335

2014-06-12 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ae8aad474 - fa601bdff refs/heads/trunk 769c9861a - ac75774d3 return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335 Project: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-06-12 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/542e71c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/542e71c2 Diff:

[2/3] git commit: Avoid incremental compaction on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365

2014-06-12 Thread jbellis
Avoid incremental compaction on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61b13b0e Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] git commit: Avoid incremental compaction on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365

2014-06-12 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b4b3d8012 - 61b13b0e6 refs/heads/trunk 7349ec2aa - 542e71c26 Avoid incremental compaction on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365 Project: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-06-12 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bafde3d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bafde3d6 Diff:

[1/3] git commit: Modify system tcp keepalive settings in Windows install scripts patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348

2014-06-12 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 61b13b0e6 - b9153f4ae refs/heads/trunk 542e71c26 - bafde3d66 Modify system tcp keepalive settings in Windows install scripts patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348 Project:

[2/3] git commit: Modify system tcp keepalive settings in Windows install scripts patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348

2014-06-12 Thread jbellis
Modify system tcp keepalive settings in Windows install scripts patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9153f4a Tree:

[2/3] git commit: return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335

2014-06-12 Thread jbellis
return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93f287c Tree: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-06-12 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e0656b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e0656b0 Diff:

[1/3] git commit: return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335

2014-06-12 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 53c95ebf3 - b93f287c8 refs/heads/cassandra-2.1 1e13cbf84 - 4e0656b0b return absolute path from resourceToFile patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335 Project: http://git-wip-us.apache.org/repos/asf

[1/3] git commit: Fix race in Thrift server that can exhaust the pool of worker threads patch by Christian Rolf and jbellis for CASSANDRA-6788

2014-06-07 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 2b002b469 - f72738125 refs/heads/cassandra-2.0 c54958a9d - 0dbb4e028 Fix race in Thrift server that can exhaust the pool of worker threads patch by Christian Rolf and jbellis for CASSANDRA-6788 Project: http://git-wip

[2/3] git commit: Fix race in Thrift server that can exhaust the pool of worker threads patch by Christian Rolf and jbellis for CASSANDRA-6788

2014-06-07 Thread jbellis
Fix race in Thrift server that can exhaust the pool of worker threads patch by Christian Rolf and jbellis for CASSANDRA-6788 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7273812 Tree: http://git-wip-us.apache.org

[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-07 Thread jbellis
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dbb4e02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dbb4e02 Diff:

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

2014-06-05 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b24b870 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b24b870 Diff:

[1/3] git commit: Fix heap size calculation on Windows patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352

2014-06-05 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 78e91c4ca - b29d882df refs/heads/trunk 99ba549d0 - 7b24b8703 Fix heap size calculation on Windows patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352 Project:

[2/3] git commit: Fix heap size calculation on Windows patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352

2014-06-05 Thread jbellis
Fix heap size calculation on Windows patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b29d882d Tree:

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

2014-06-04 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e85f0c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e85f0c3 Diff:

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

2014-06-04 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/087394c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087394c8 Diff:

[2/6] git commit: cleanup

2014-06-04 Thread jbellis
cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00b5c36c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00b5c36c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00b5c36c Branch:

[1/6] git commit: cleanup

2014-06-04 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 05ffa8ff1 - 00b5c36cc refs/heads/cassandra-2.1 2d76d9fc3 - 8e85f0c32 refs/heads/trunk f81d5ddc6 - 087394c8a cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-06-04 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e85f0c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e85f0c3 Diff:

[3/6] git commit: cleanup

2014-06-04 Thread jbellis
cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00b5c36c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00b5c36c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00b5c36c Branch:

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

2014-06-04 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2306fb87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2306fb87 Diff:

[2/3] git commit: close segments in resetUnsafe patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334

2014-06-04 Thread jbellis
close segments in resetUnsafe patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/285c369a Tree:

[1/3] git commit: close segments in resetUnsafe patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334

2014-06-04 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 8e85f0c32 - 285c369ac refs/heads/trunk 087394c8a - 2306fb877 close segments in resetUnsafe patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

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

2014-06-03 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1914a111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1914a111 Diff:

[2/6] git commit: merge #7063 from 1.2

2014-06-03 Thread jbellis
merge #7063 from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2800c7fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2800c7fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2800c7fd

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

2014-06-03 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9de8d3ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9de8d3ef Diff:

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

2014-06-03 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9de8d3ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9de8d3ef Diff:

[3/6] git commit: merge #7063 from 1.2

2014-06-03 Thread jbellis
merge #7063 from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2800c7fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2800c7fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2800c7fd

[1/6] git commit: merge #7063 from 1.2

2014-06-03 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 58bb974a3 - 2800c7fdb refs/heads/cassandra-2.1 f2a656e9d - 9de8d3ef5 refs/heads/trunk fd50a2fdf - 1914a1116 merge #7063 from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-05-30 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93572d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93572d5 Diff:

[3/6] git commit: make Shuffle client static

2014-05-30 Thread jbellis
make Shuffle client static Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68ac31f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68ac31f Diff:

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

2014-05-30 Thread jbellis
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82627111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82627111 Diff:

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

2014-05-30 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93572d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93572d5 Diff:

[2/6] git commit: make Shuffle client static

2014-05-30 Thread jbellis
make Shuffle client static Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68ac31f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68ac31f Diff:

[1/6] git commit: make Shuffle client static

2014-05-30 Thread jbellis
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 886d9fce4 - e68ac31f3 refs/heads/cassandra-2.1 90477c310 - d93572d5c refs/heads/trunk d579be520 - 826271118 make Shuffle client static Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-28 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a652565 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565 Diff:

[7/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-28 Thread jbellis
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a652565 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a652565 Diff:

[4/9] git commit: explain how to specify a keyspace

2014-05-28 Thread jbellis
explain how to specify a keyspace Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59ae73c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59ae73c Diff:

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