[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-13 Thread jasobrown
Merge branch 'cassandra-2.2' into cassandra-3.0 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/6e2cf572 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e2cf572 Diff: http:/

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-12 Thread aleksey
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ff2a5b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ff2a5b7 Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-12 Thread jmckenzie
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a186ac6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a186ac6e Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-11 Thread snazy
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14558378 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14558378 Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-11 Thread jmckenzie
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1a260c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1a260c9 Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-11 Thread jmckenzie
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d054181b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d054181b Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e1e3369 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e1e3369 Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-09 Thread blerer
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8984ca79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8984ca79 Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-06 Thread aleksey
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a472aa9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a472aa9e Diff: http://git-wip-us.apache.org/repos/asf

<    1   2