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

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

2014-08-06 Thread brandonwilliams
Merge branch 'cassandra-2.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/7fc89ad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fc89ad7 Diff:

[8/9] git commit: merge from 2.1.0

2014-07-25 Thread jbellis
merge from 2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef9473a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef9473a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef9473a0

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

2014-06-19 Thread yukim
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

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

[8/9] git commit: merge from 2.1

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

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

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

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

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

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

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

[8/9] git commit: merge from 2.0

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

[8/9] git commit: merge from 2.0

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

[8/9] git commit: merge from 2.0

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

[8/9] git commit: merge from 2.0

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

[8/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:

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

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

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

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

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

2013-10-22 Thread brandonwilliams
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/8a069587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a069587 Diff:

[8/9] git commit: merge from 1.2

2013-10-13 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b2d9d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b2d9d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b2d9d5

[8/9] git commit: merge from 1.2

2013-09-30 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65b1e36c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b1e36c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b1e36c

[8/9] git commit: merge from 1.2

2013-09-24 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a06a1383 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a06a1383 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a06a1383

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

2013-09-11 Thread brandonwilliams
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f117da0 Tree:

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

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

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

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

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

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

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

2013-01-25 Thread brandonwilliams
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/thrift/ThriftValidation.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4a941e4 Tree: