[9/9] git commit: merge

2014-08-07 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/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:

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

2014-08-06 Thread brandonwilliams
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:

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

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

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

2014-06-19 Thread yukim
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/65b19cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b19cae Diff:

[9/9] git commit: merge from 2.1

2014-05-28 Thread jbellis
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/3e91cb6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e91cb6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e91cb6d

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

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

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

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

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

2014-03-25 Thread jbellis
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/b96adb99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b96adb99 Diff:

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

2014-03-24 Thread yukim
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/5f6e780d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6e780d Diff:

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

2014-03-21 Thread jbellis
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/0493da93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0493da93 Diff:

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

2014-03-21 Thread jbellis
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/699189f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699189f1 Diff:

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

2014-03-04 Thread jbellis
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/c946cbf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c946cbf1 Diff:

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

2014-02-28 Thread jbellis
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/3c186bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c186bef Diff:

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

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

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

2014-01-31 Thread brandonwilliams
Merge branch 'cassandra-2.0' 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/9d41638a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d41638a Diff:

[9/9] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

2013-11-20 Thread jbellis
Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/256da638 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/256da638 Diff:

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

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

[9/9] git commit: merge from 2.0

2013-10-13 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/2531424c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2531424c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2531424c

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

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

[9/9] git commit: merge from 2.0

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

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

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

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

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

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

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

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

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

[9/9] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

2013-06-06 Thread jbellis
Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e9f51d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e9f51d1 Diff:

[9/9] git commit: Merge branch 'cassandra-1.2' into trunk

2013-01-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 9c8d94930 - 3298c2f19 refs/heads/cassandra-1.2 8540974db - f4a941e49 refs/heads/trunk 6a15bb37b - b7ba0a917 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: