[1/2] git commit: Better messaging on URI failure on cassandra.config Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398

2014-08-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk f92ae20a8 - 32358d646 Better messaging on URI failure on cassandra.config Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-07 Thread jmckenzie
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/32358d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32358d64 Diff:

git commit: Better messaging on URI failure on cassandra.config Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398

2014-08-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 319eeabb4 - 756c85e86 Better messaging on URI failure on cassandra.config Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[02/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/277ca64c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/277ca64c Diff:

[05/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/26cd4408 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26cd4408 Diff:

[09/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/f64a113e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f64a113e Diff:

[20/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/15280641 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15280641 Diff:

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

2014-08-11 Thread jmckenzie
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/740bcb54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/740bcb54 Diff:

[24/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/e607d944 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e607d944 Diff:

[10/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/7dd320c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd320c9 Diff:

[18/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/94cfec89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94cfec89 Diff:

[28/50] [abbrv] git commit: fix build

2014-08-11 Thread jmckenzie
fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41f36778 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41f36778 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41f36778 Branch:

[22/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/862d7f94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/862d7f94 Diff:

[26/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/9e43a2f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e43a2f8 Diff:

[30/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/fe30c2c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe30c2c2 Diff:

[29/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/87dc93ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87dc93ec Diff:

[33/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/17055bfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17055bfd Diff:

[17/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/774f3acb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/774f3acb Diff:

[06/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/80820109 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80820109 Diff:

[12/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/25041771 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25041771 Diff:

[45/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/5205ce66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5205ce66 Diff:

[47/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/c7e191ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7e191ba Diff:

[08/50] [abbrv] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-08-11 Thread jmckenzie
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/1e0b4c5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e0b4c5e Diff:

[48/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/755d345f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/755d345f Diff:

[21/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/beeca7d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beeca7d2 Diff:

[27/50] [abbrv] git commit: fix build

2014-08-11 Thread jmckenzie
fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1924ba3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1924ba3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1924ba3 Branch:

[49/50] [abbrv] git commit: Prompt on missing dependency in cqlsh on Windows Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749

2014-08-11 Thread jmckenzie
Prompt on missing dependency in cqlsh on Windows Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70d9f895 Tree:

[35/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/f95b40c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f95b40c1 Diff:

[01/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 334969fdd - 70d9f895d 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/bf4c76e4 Tree:

[25/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/2919a509 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2919a509 Diff:

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

2014-08-11 Thread jmckenzie
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/8625661d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8625661d Diff:

[03/50] [abbrv] git commit: ninja add benedict to committers

2014-08-11 Thread jmckenzie
ninja add benedict to committers Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a8d978f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a8d978f Diff:

[07/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/a4d3da31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4d3da31 Diff:

[41/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/05eac99d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05eac99d Diff:

[04/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/efe57f23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efe57f23 Diff:

[37/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/d1e41c01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1e41c01 Diff:

[23/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/b8b37760 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8b37760 Diff:

[40/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/4c3ba4f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c3ba4f3 Diff:

[19/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/487de3da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487de3da Diff:

[43/50] [abbrv] Support pure user-defined functions

2014-08-11 Thread jmckenzie
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25411bf1/src/java/org/apache/cassandra/transport/Server.java -- diff --git a/src/java/org/apache/cassandra/transport/Server.java

[32/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59123b6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59123b6f Diff:

[46/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/d2b24def Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2b24def Diff:

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

2014-08-11 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/ErrorCollector.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a69811e Tree:

[16/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/f7fab28e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7fab28e Diff:

[13/50] [abbrv] git commit: merge from 2.1

2014-08-11 Thread jmckenzie
merge from 2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50191828 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50191828 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50191828

git commit: Prompt on missing dependency in cqlsh on Windows Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749

2014-08-11 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk cb8ce8325 - 70d9f895d Prompt on missing dependency in cqlsh on Windows Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-11 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: test/system/test_thrift_server.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb8ce832 Tree:

[44/50] [abbrv] git commit: Support pure user-defined functions

2014-08-11 Thread jmckenzie
Support pure user-defined functions Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7395 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25411bf1 Tree:

[34/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/46193d75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46193d75 Diff:

[39/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/32358d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32358d64 Diff:

[38/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/f92ae20a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f92ae20a Diff:

[36/50] [abbrv] git commit: merge

2014-08-11 Thread jmckenzie
merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56141aee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56141aee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56141aee Branch:

[31/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/00d7e4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00d7e4c7 Diff:

[42/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-11 Thread jmckenzie
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/2f25e6e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f25e6e6 Diff:

[1/2] git commit: build.xml - exclude *.ps1 from fixcrlf

2014-08-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 25982d12c - 54215a21f build.xml - exclude *.ps1 from fixcrlf Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/3] git commit: build.xml - exclude *.ps1 from fixcrlf

2014-08-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 59600625f - 696acc923 build.xml - exclude *.ps1 from fixcrlf Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: build.xml - exclude *.ps1 from fixcrlf

2014-08-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 81f8e3705 - dc8b4e111 build.xml - exclude *.ps1 from fixcrlf Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-12 Thread jmckenzie
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/696acc92 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/696acc92 Diff:

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

2014-08-12 Thread jmckenzie
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/54215a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54215a21 Diff:

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

2014-08-12 Thread jmckenzie
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/54215a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54215a21 Diff:

git commit: Add new CMS GC flags on Windows launch scripts for JVM 7u60

2014-08-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 aab471179 - e00bb4a2a Add new CMS GC flags on Windows launch scripts for JVM 7u60 Patch by Josh McKenzie, reviewed by jbellis for CASSANDRA-7714 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-13 Thread jmckenzie
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/9b4c4ef6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b4c4ef6 Diff:

[1/2] git commit: Add new CMS GC flags on Windows launch scripts for JVM 7u60

2014-08-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 5d6d89199 - 9b4c4ef65 Add new CMS GC flags on Windows launch scripts for JVM 7u60 Patch by Josh McKenzie, reviewed by jbellis for CASSANDRA-7714 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: fix generate-eclipse-files build.xml target on JDK 8

2014-08-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 50fc8ba0c - 74e7f28f7 fix generate-eclipse-files build.xml target on JDK 8 Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] git commit: fix generate-eclipse-files build.xml target on JDK 8

2014-08-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 5aaa4a027 - 048f72bd3 fix generate-eclipse-files build.xml target on JDK 8 Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-13 Thread jmckenzie
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/048f72bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/048f72bd Diff:

git commit: Implement -f functionality in stop-server.bat

2014-09-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ad9f51fc5 - c1c337536 Implement -f functionality in stop-server.bat patch by Philip Thompson; reviewed by Josh McKenzie for CASSANDRA-7901 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-09-08 Thread jmckenzie
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/6cb1f077 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cb1f077 Diff:

[1/2] git commit: Implement -f functionality in stop-server.bat

2014-09-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 928815989 - 6cb1f0779 Implement -f functionality in stop-server.bat patch by Philip Thompson; reviewed by Josh McKenzie for CASSANDRA-7901 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: Get Windows command-line flags in-line with linux

2014-09-10 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9b9bf45b6 - dbcc4eae6 Get Windows command-line flags in-line with linux patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7748 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] git commit: Get Windows command-line flags in-line with linux

2014-09-10 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 2cba3fc95 - 685140267 Get Windows command-line flags in-line with linux patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7748 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-09-10 Thread jmckenzie
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/68514026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68514026 Diff:

[1/2] Clean up generics in dht package

2014-11-03 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 623aa6fe7 - ad84e4d7e http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84e4d7/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java -- diff --git

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

2014-11-03 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/cql/QueryProcessor.java src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Clean up generics in dht package

2014-11-03 Thread jmckenzie
Clean up generics in dht package Patch by blambov, reviewed by jmckenzie for CASSANDRA-8171 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84e4d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/3] Clean up generics in dht package

2014-11-03 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 632ebc5c5 - 49768fea0 http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84e4d7/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java -- diff --git

[2/2] git commit: Clean up generics in dht package

2014-11-03 Thread jmckenzie
Clean up generics in dht package Patch by blambov, reviewed by jmckenzie for CASSANDRA-8171 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84e4d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/4] git commit: Add column update delta histogram

2014-11-04 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk bd32104ec - 254cd85a5 Add column update delta histogram Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

2014-11-04 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/AtomicBTreeColumns.java src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-11-04 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/AtomicSortedColumns.java src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/Memtable.java

[3/4] git commit: Add column update delta histogram (2.1)

2014-11-04 Thread jmckenzie
Add column update delta histogram (2.1) Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5acc7a9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] git commit: Add column update delta histogram

2014-11-04 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c816a7a49 - 5acc7a9ed Add column update delta histogram Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[3/3] git commit: Add column update delta histogram (2.1)

2014-11-04 Thread jmckenzie
Add column update delta histogram (2.1) Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5acc7a9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-11-04 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/AtomicSortedColumns.java src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/Memtable.java

git commit: Add column update delta histogram

2014-11-04 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 7bfb34714 - e01976078 Add column update delta histogram Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

git commit: Optimize partitioner tokens

2014-11-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 82b91aba6 - 6eef6f785 Optimize partitioner tokens Patch by blambov, reviewed by jmckenzie for CASSANDRA-8230 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

2014-11-05 Thread jmckenzie
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/70f1ac68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70f1ac68 Diff:

[1/2] git commit: Optimize partitioner tokens

2014-11-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 51bbec757 - 70f1ac680 Optimize partitioner tokens Patch by blambov, reviewed by jmckenzie for CASSANDRA-8230 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Fix overflow on histogram computation

2014-11-06 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 85ea37356 - 9685622b3 Fix overflow on histogram computation Patch by cyeksigian; reviewed by jmckenzie for CASSANDRA-8028 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

2014-11-06 Thread jmckenzie
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/b4cbb28f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4cbb28f Diff:

[1/2] git commit: Fix overflow on histogram computation

2014-11-06 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk d5b2fa206 - b4cbb28f3 Fix overflow on histogram computation Patch by cyeksigian; reviewed by jmckenzie for CASSANDRA-8028 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

cassandra git commit: Fix regression in HadoopCompat from CASSANDRA-7579

2014-11-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c80d2d3a4 - deff175a4 Fix regression in HadoopCompat from CASSANDRA-7579 Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

2014-11-12 Thread jmckenzie
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/cf94e3c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf94e3c3 Diff:

[1/2] cassandra git commit: Fix regression in HadoopCompat from CASSANDRA-7579

2014-11-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 611d1baec - cf94e3c31 Fix regression in HadoopCompat from CASSANDRA-7579 Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

cassandra git commit: Fix ordering on SSTableScanner / SSTableReader close

2014-11-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5615a79cf - 3484181e2 Fix ordering on SSTableScanner / SSTableReader close Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8019 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/2] cassandra git commit: Fix ordering on SSTableScanner / SSTableReader close

2014-11-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 4ff6e7dff - 9c66482e1 Fix ordering on SSTableScanner / SSTableReader close Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8019 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

2014-11-13 Thread jmckenzie
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/9c66482e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c66482e Diff:

cassandra git commit: Allow snapshot-based repair on Windows for 3.0

2014-11-14 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk b4d7f3bed - 58fdc6b5c Allow snapshot-based repair on Windows for 3.0 Patch by jmckenzie; reviewed by yukim for CASSANDRA-8309 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[2/2] cassandra git commit: Remove hidden references to partitioner in Tokens

2014-11-21 Thread jmckenzie
Remove hidden references to partitioner in Tokens Patch by blambov; reviewed by jmckenzie for CASSANDRA-8244 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07893d70 Tree: http://git-wip-us.apache.org/repos/asf

[1/2] cassandra git commit: Remove hidden references to partitioner in Tokens

2014-11-21 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 68fdb2db2 - 07893d704 http://git-wip-us.apache.org/repos/asf/cassandra/blob/07893d70/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java -- diff

  1   2   3   4   5   6   7   8   9   10   >