[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-11-06 Thread bdeggleston
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af600c79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af600c79 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-04-24 Thread marcuse
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22bb2cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22bb2cf6 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-04-18 Thread adelapena
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a31a848d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a31a848d Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-30 Thread aleksey
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e819fec8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e819fec8 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-12 Thread adelapena
Merge branch 'cassandra-3.0' into cassandra-3.11 # Conflicts: # src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c05d98a3 Tree:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-12 Thread adelapena
Merge branch 'cassandra-3.0' into cassandra-3.11 # Conflicts: # CHANGES.txt # src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12841938 Tree:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-06-15 Thread mshuler
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ea7f7c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ea7f7c6 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-05-12 Thread yukim
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2299e68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2299e68 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-05-11 Thread samt
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a064332 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a064332 Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-07 Thread ifesdjeen
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/863ad11c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/863ad11c Diff:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-23 Thread slebresne
Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Legacy deserializer can create unexpected boundary range tombstones Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dc1aa19 Tree:

[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-09 Thread snazy
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d5cd2d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d5cd2d4 Diff: