| commit | 97dc8d525574a68a43fb05cf41d88c3342a68e72 | [log] [tgz] |
|---|---|---|
| author | Joshua McKenzie <jmckenzie@apache.org> | Fri Nov 06 13:42:49 2015 -0500 |
| committer | Joshua McKenzie <jmckenzie@apache.org> | Fri Nov 06 13:42:49 2015 -0500 |
| tree | 1a8d4c860143ad026770c93655baf0c995c4c387 | |
| parent | 39bc5de68a53b5c7cea0fd778d33ef0687360fb0 [diff] | |
| parent | f8783b7bb1bd16d29565c3be86480a7188e91ee0 [diff] |
Merge branch 'cassandra-2.2' into cassandra-3.0