| commit | 6b994cabe3f9cfc07179726f2a4f7090981d94b2 | [log] [tgz] |
|---|---|---|
| author | Sam Tunnicliffe <sam@beobal.com> | Fri Jun 03 10:36:51 2016 +0100 |
| committer | Sam Tunnicliffe <sam@beobal.com> | Fri Jun 03 10:56:39 2016 +0100 |
| tree | 560a9f76c62678f66ac756b177ceabb81f8528a9 | |
| parent | bedc7425796afe311e148669a3e7b5255e5150a2 [diff] | |
| parent | 360541f16a158f560d7cce1fcc264e246a80d10f [diff] |
Merge branch 'cassandra-2.2' into cassandra-3.0