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

2014-02-07 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8b1a9e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8b1a9e1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-04 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d4f7c91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d4f7c91 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-24 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e488e587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e488e587 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-16 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd49497e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd49497e Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-10 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5e2a01a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5e2a01a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-30 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76ee9a15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76ee9a15 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-17 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c821d8b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c821d8b0 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-02 Thread yukim
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/679ec7e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/679ec7e8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-10-23 Thread brandonwilliams
Merge branch 'cassandra-2.0' 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/51b66677 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51b66677 Diff: http://git-wip

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

2013-10-17 Thread jasobrown
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/231b345f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/231b345f Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-10-02 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70dc3202 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70dc3202 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-09-24 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/938e6989 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/938e6989 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-09-23 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af4799b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af4799b5 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-09-18 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5102e8d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5102e8d7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-09-17 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fc48bd3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc48bd3 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-09-03 Thread slebresne
Merge branch 'cassandra-2.0' into trunk Conflicts: lib/licenses/slf4j-log4j12-1.7.2.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ea3b153 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ea3