| commit | 10e719cb6c15b38ff2ae769734d0508509d2ea22 | [log] [tgz] |
|---|---|---|
| author | Marcus Eriksson <marcuse@apache.org> | Mon Aug 01 10:44:36 2016 +0200 |
| committer | Marcus Eriksson <marcuse@apache.org> | Mon Aug 01 10:44:36 2016 +0200 |
| tree | 418572eeb6ba2cad02dcfb378adfd9b8234d4f61 | |
| parent | 1823c84b827ff5f38862757db58001105f1d753f [diff] | |
| parent | 25159c388bf5270e60775171344d9bf9838bbdb4 [diff] |
Merge branch 'cassandra-2.2' into cassandra-3.0