[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-09-03 Thread tylerhobbs
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/2001c257 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2001c257 Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-27 Thread marcuse
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/5abd129f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abd129f Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-22 Thread slebresne
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/cql3/statements/BatchStatement.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-20 Thread aleksey
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/6e051257 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e051257 Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-19 Thread tylerhobbs
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/92325cc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92325cc1 Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-19 Thread aleksey
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/558bb724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558bb724 Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-18 Thread aleksey
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/69abfaae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69abfaae Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-17 Thread aleksey
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/7035cfcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7035cfcc Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-12 Thread jake
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/54c6e66a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54c6e66a Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-01 Thread tylerhobbs
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/3faf88cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faf88cd Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-07-24 Thread aleksey
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/51dfe782 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51dfe782 Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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