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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/service/paxos/PaxosState.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4eb65354 Tree: http://git-wip-us.apache.org/repos/

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/125f19a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/125f19a8 Diff: http://git-wip

[7/7] 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/5d6d8919 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d6d8919 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

[7/7] 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/9aeae588 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aeae588 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d583c9dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d583c9dc Diff: http://git-wip

[7/7] 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/0a984520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a984520 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

[7/7] 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/8b49af0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b49af0b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

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

[7/7] 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/2d92f14b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d92f14b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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