| commit | 3b448b33785c86f554bc07266de1c39e0ac502d9 | [log] [tgz] |
|---|---|---|
| author | Marcus Eriksson <marcuse@apache.org> | Tue Jun 28 10:16:49 2016 +0200 |
| committer | Marcus Eriksson <marcuse@apache.org> | Tue Jun 28 10:16:49 2016 +0200 |
| tree | 0d14a6fe5cdfb24c5ac66519e6c1c8b6f4eb2e9f | |
| parent | 6fcf3353b65195f0b1d0c1e20c5b8d562a8d21d5 [diff] | |
| parent | 2811f15bc9117fed4fb38de490d25d68df4e85b7 [diff] |
Merge branch 'cassandra-2.1' into cassandra-2.2