| commit | b234ca3ee4101a34b761948d633ef4a12aa70ca2 | [log] [tgz] |
|---|---|---|
| author | Sylvain Lebresne <sylvain@datastax.com> | Fri Jan 27 09:26:14 2017 +0100 |
| committer | Sylvain Lebresne <sylvain@datastax.com> | Fri Jan 27 09:26:53 2017 +0100 |
| tree | 600a18507223f0b333c6ab62ab1491d3e97a3b10 | |
| parent | 237e14dd99cf3975d54cb1e41126c40bc183f3b4 [diff] | |
| parent | e1da99a1d82b5313f022307c2e110afc07e112b6 [diff] |
Merge commit 'e1da99a1d82b5313f022307c2e110afc07e112b6' into cassandra-3.11 * commit 'e1da99a1d82b5313f022307c2e110afc07e112b6': Revert CASSANDRA-12768 (and update fix of CASSANDRA-12694) due to upgrade regression