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

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

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

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

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

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

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

2014-07-29 Thread brandonwilliams
Merge branch 'cassandra-2.1.0' into cassandra-2.1 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/6b47853d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b47853d Diff:

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

2014-07-21 Thread brandonwilliams
Merge branch 'cassandra-2.1.0' into cassandra-2.1 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/3b14f6a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5 Diff:

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

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

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

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

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

2014-05-20 Thread brandonwilliams
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/86cd4234 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86cd4234 Diff:

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

2014-05-05 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6224118 Tree:

[11/12] git commit: merge from 2.0

2014-03-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/45a6373e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45a6373e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45a6373e

[11/12] git commit: merge from 2.0

2014-03-14 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/e0718bcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0718bcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0718bcd

[11/12] git commit: merge from 2.0

2014-02-19 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/8e101bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e101bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e101bef

[11/12] git commit: merge

2013-10-19 Thread jbellis
merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58014d30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58014d30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58014d30 Branch:

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

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

[11/12] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0

2013-08-07 Thread jbellis
Merge branch 'cassandra-2.0.0' 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/23becceb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23becceb Diff:

[11/12] git commit: Merge branch '3886' into cassandra-1.0

2012-02-13 Thread brandonwilliams
Merge branch '3886' into cassandra-1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb0efd09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb0efd09 Diff: