[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-12-04 Thread tylerhobbs
Merge branch 'cassandra-3.0' into cassandra-3.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/f0d45ea3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0d45ea3 Diff: http:/

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-12-01 Thread snazy
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca32e053 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca32e053 Diff: http://git-wip-us.apache.org/repos/asf

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-27 Thread blerer
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17e13e5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e13e5c Diff: http://git-wip-us.apache.org/repos/asf

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-20 Thread slebresne
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3944775e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3944775e Diff: http://git-wip-us.apache.org/repos/asf

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

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

[3/3] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.1

2015-11-12 Thread blerer
Merge branch cassandra-3.0 into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6688911f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6688911f Diff: http://git-wip-us.apache.org/repos/asf/c

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-10 Thread aleksey
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11b073e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11b073e6 Diff: http://git-wip-us.apache.org/repos/asf