tree dd86193c1be528c080ffb50c5cd65d14c9dbcd57
parent eebadcf1d9c539f0b5c5a9a4606fadd87a3cec7f
parent 8868b744cae5b5b4ef67b7738a117c6e71888235
author Stefania Alborghetti <stefania.alborghetti@datastax.com> 1469777391 +0800
committer Stefania Alborghetti <stefania.alborghetti@datastax.com> 1469777427 +0800

Merge branch 'cassandra-3.0' into cassandra-3.9