| commit | 38e973d08f8b51fb8b47179318b7e4b9754d34f9 | [log] [tgz] | 
|---|---|---|
| author | Stefania Alborghetti <stefania.alborghetti@datastax.com> | Fri Apr 29 08:17:21 2016 +0800 | 
| committer | Stefania Alborghetti <stefania.alborghetti@datastax.com> | Fri Apr 29 08:17:21 2016 +0800 | 
| tree | 1873fabb9e03939a5bf37b9a00a49673289cf401 | |
| parent | c8d955533b6968368907e5b090a309ac57bf419f [diff] | |
| parent | 86c5a00c23a57f881f545732a1b35fe190546fb3 [diff] | 
Merge branch 'cassandra-2.1' into cassandra-2.2