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

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

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

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

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

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

[1/3] git commit: simplify: prefer containsKey(x) to keySet().contains(x)

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b16c6b9a9 - deaf5ba15 simplify: prefer containsKey(x) to keySet().contains(x) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f40ddba4 Tree:

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

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

[1/4] git commit: simplify: prefer containsKey(x) to keySet().contains(x)

Repository: cassandra Updated Branches: refs/heads/trunk a28f64f91 - 204442452 simplify: prefer containsKey(x) to keySet().contains(x) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f40ddba4 Tree:

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

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

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

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

git commit: update netty-all license

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 54b241858 - 9b536eca9 update netty-all license Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b536eca Tree:

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

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

[1/2] git commit: update netty-all license

Repository: cassandra Updated Branches: refs/heads/trunk c7ecd4a6c - 43292388e update netty-all license Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b536eca Tree:

git commit: fix logging context

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9b536eca9 - cd9e4638f fix logging context Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd9e4638 Tree:

[1/2] git commit: fix logging context

Repository: cassandra Updated Branches: refs/heads/trunk 43292388e - 6125b0b86 fix logging context Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd9e4638 Tree:

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

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

git commit: remove incorrect use of generics in non-generified method call

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 709b9fc31 - 62d9c4367 remove incorrect use of generics in non-generified method call Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62d9c436 Tree:

[1/2] git commit: remove incorrect use of generics in non-generified method call

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e398c6bb8 - a89951283 remove incorrect use of generics in non-generified method call Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62d9c436 Tree:

[1/3] git commit: remove incorrect use of generics in non-generified method call

Repository: cassandra Updated Branches: refs/heads/trunk d66022392 - 616c019ae remove incorrect use of generics in non-generified method call Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62d9c436 Tree:

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

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

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

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

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

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

git commit: make NoOp's constructor private as it's a singleton

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a89951283 - 371507a12 make NoOp's constructor private as it's a singleton Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/371507a1 Tree:

[1/2] git commit: make NoOp's constructor private as it's a singleton

Repository: cassandra Updated Branches: refs/heads/trunk 616c019ae - ac8d3c174 make NoOp's constructor private as it's a singleton Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/371507a1 Tree:

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

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

git commit: fix cast guard to be of the c* FutureTask type

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e56a64edb - f66689db9 fix cast guard to be of the c* FutureTask type Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f66689db Tree:

[1/2] git commit: fix cast guard to be of the c* FutureTask type

Repository: cassandra Updated Branches: refs/heads/trunk ce248f227 - 91ea6da10 fix cast guard to be of the c* FutureTask type Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f66689db Tree:

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

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

git commit: use long math for long results

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 f66689db9 - 1c33ea367 use long math for long results Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c33ea36 Tree:

[1/2] git commit: use long math for long results

Repository: cassandra Updated Branches: refs/heads/trunk 91ea6da10 - 953a3729f use long math for long results Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c33ea36 Tree:

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

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

git commit: add src/resources to the generate eclipse .project file's src paths

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b59ae73cf - 0c96f99e4 add src/resources to the generate eclipse .project file's src paths patch by opeer reviewed by dbrosius for cassandra-5964 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

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

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

[1/3] git commit: add src/resources to the generate eclipse .project file's src paths

Repository: cassandra Updated Branches: refs/heads/trunk 49dd289ed - 079de5ba9 add src/resources to the generate eclipse .project file's src paths patch by opeer reviewed by dbrosius for cassandra-5964 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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

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

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

[1/2] git commit: add src/resources to the generate eclipse .project file's src paths

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3ac261431 - 6d1500c50 add src/resources to the generate eclipse .project file's src paths patch by opeer reviewed by dbrosius for cassandra-5964 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

git commit: don't NPE shutting down, due to gossip failure

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 6faf80c9d - ea5b6246d don't NPE shutting down, due to gossip failure Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea5b6246 Tree:

[1/2] git commit: don't NPE shutting down, due to gossip failure

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 39c295d80 - 7f930e027 don't NPE shutting down, due to gossip failure Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea5b6246 Tree:

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

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

[1/3] git commit: don't NPE shutting down, due to gossip failure

Repository: cassandra Updated Branches: refs/heads/trunk 0171cd6ff - e228703b8 don't NPE shutting down, due to gossip failure Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea5b6246 Tree:

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

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

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

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

git commit: fix merge-created bad map key lookup type

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e0502ea29 - f64dc4527 fix merge-created bad map key lookup type Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452 Tree:

[1/2] git commit: fix merge-created bad map key lookup type

Repository: cassandra Updated Branches: refs/heads/trunk deee02c53 - f5c54aac9 fix merge-created bad map key lookup type Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452 Tree:

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

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

git commit: only query once for local host id on join

Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 8abe9f6f5 - de1f7ee1e only query once for local host id on join patch by dbrosius reviewed by jbellis for cassandra-7257 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

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

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

[1/2] git commit: only query once for local host id on join

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b9802ffbc - 4f4b5dd1e only query once for local host id on join patch by dbrosius reviewed by jbellis for cassandra-7257 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[1/3] git commit: only query once for local host id on join

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 0f706c528 - c0e94ae60 only query once for local host id on join patch by dbrosius reviewed by jbellis for cassandra-7257 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

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

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

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

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

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

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

[1/4] git commit: only query once for local host id on join

Repository: cassandra Updated Branches: refs/heads/trunk c2cfefc50 - d1f1b8e1a only query once for local host id on join patch by dbrosius reviewed by jbellis for cassandra-7257 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

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

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

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

git commit: remove unused field 'severity'

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 4f4b5dd1e - 76139e426 remove unused field 'severity' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76139e42 Tree:

[1/3] git commit: remove unused field 'severity'

Repository: cassandra Updated Branches: refs/heads/trunk f987e361e - 96171d36b remove unused field 'severity' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76139e42 Tree:

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

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

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

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

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

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

[1/2] git commit: remove unused field 'severity'

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ba08eb357 - 8465a91b4 remove unused field 'severity' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76139e42 Tree:

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

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

[1/3] git commit: reduce garbage on codec flag deserialization

Repository: cassandra Updated Branches: refs/heads/trunk 6ac88ab16 - cb50f62b0 reduce garbage on codec flag deserialization patch by belliottsmith reviewed by dbrosius for cassandra-7244 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: reduce garbage on codec flag deserialization

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 5d187fb82 - 7eefbf8b9 reduce garbage on codec flag deserialization patch by belliottsmith reviewed by dbrosius for cassandra-7244 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/2] git commit: reduce garbage on codec flag deserialization

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c045690b1 - 3b8482a01 reduce garbage on codec flag deserialization patch by belliottsmith reviewed by dbrosius for cassandra-7244 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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

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

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

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

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

[1/2] git commit: Improve javadoc for KeysIndex

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3b8482a01 - 4ad6db380 Improve javadoc for KeysIndex patch by plin reviewed by dbrosius for cassandra-7253 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

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

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

[1/3] git commit: Improve javadoc for KeysIndex

Repository: cassandra Updated Branches: refs/heads/trunk cb50f62b0 - ea284ad8f Improve javadoc for KeysIndex patch by plin reviewed by dbrosius for cassandra-7253 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

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

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

git commit: Improve javadoc for KeysIndex

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 7eefbf8b9 - eaa78e085 Improve javadoc for KeysIndex patch by plin reviewed by dbrosius for cassandra-7253 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[1/2] git commit: allow num_tokens to be unspecified, as described in the yaml

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 4ad6db380 - 07dc6b5cc allow num_tokens to be unspecified, as described in the yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58dc4888 Tree:

git commit: allow num_tokens to be unspecified, as described in the yaml

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 eaa78e085 - 58dc48889 allow num_tokens to be unspecified, as described in the yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58dc4888 Tree:

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

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

[1/3] git commit: allow num_tokens to be unspecified, as described in the yaml

Repository: cassandra Updated Branches: refs/heads/trunk ea284ad8f - a125bb068 allow num_tokens to be unspecified, as described in the yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58dc4888 Tree:

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

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

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

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

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

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

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

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

[3/6] git commit: remove duplicate queries for local tokens

remove duplicate queries for local tokens patch by dbrosius reviewed by ayeschenko for cassandra-7182 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0132e546 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: add the sample properties file to the example trigger jar so it can be loaded

Repository: cassandra Updated Branches: refs/heads/trunk 401ed436a - a1f9b7c71 add the sample properties file to the example trigger jar so it can be loaded Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1f9b7c7

git commit: fix typo

Repository: cassandra Updated Branches: refs/heads/trunk d2b6063ad - 401ed436a fix typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/401ed436 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/401ed436

git commit: minor nit: use the keyspace parameter

Repository: cassandra Updated Branches: refs/heads/trunk 57f3b802b - 7879e7f9b minor nit: use the keyspace parameter Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7879e7f9 Tree:

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

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

[3/5] git commit: remove duplicate queries for local tokens

remove duplicate queries for local tokens patch by dbrosius reviewed by ayeschenko for cassandra-7182 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0132e546 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/2] git commit: Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e3dd88a8c - 7b398c52d Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize patch by btheisen reviewed by dbrosius for cassandra-7198 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

git commit: minor cleanups in trigger sample

Repository: cassandra Updated Branches: refs/heads/trunk 33939cae6 - 3ce2ce714 minor cleanups in trigger sample Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ce2ce71 Tree:

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

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

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

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

[1/3] git commit: fix c* launch issues on Russian os's due to output of linux 'free' cmd

Repository: cassandra Updated Branches: refs/heads/trunk 67ed3375b - 70360cf25 fix c* launch issues on Russian os's due to output of linux 'free' cmd patch by dbrosius reviewed by bwilliams for cassandra-6162 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

git commit: Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 7484bd419 - 453a07430 Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize patch by btheisen reviewed by dbrosius for cassandra-7198 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

[1/4] git commit: reduce garbage creation in calculatePendingRanges

Repository: cassandra Updated Branches: refs/heads/trunk e48a00b6d - 67ed3375b reduce garbage creation in calculatePendingRanges patch by dbrosius reviewed by bwilliams for cassandra-7191 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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

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

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

[1/2] git commit: fix c* launch issues on Russian os's due to output of linux 'free' cmd

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 773b95efb - 1b1f0b079 fix c* launch issues on Russian os's due to output of linux 'free' cmd patch by dbrosius reviewed by bwilliams for cassandra-6162 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

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

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

git commit: remove unused classes

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6be62c2c4 - c54961316 remove unused classes patch by dshelepov reviewed by dbrosius for cassandra-7197 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: fix CHANGES

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c54961316 - 2a77695f3 fix CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a77695f Tree:

[2/3] git commit: fix CHANGES

fix CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a77695f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a77695f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a77695f Branch:

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