tree 418572eeb6ba2cad02dcfb378adfd9b8234d4f61
parent 1823c84b827ff5f38862757db58001105f1d753f
parent 25159c388bf5270e60775171344d9bf9838bbdb4
author Marcus Eriksson <marcuse@apache.org> 1470041076 +0200
committer Marcus Eriksson <marcuse@apache.org> 1470041076 +0200

Merge branch 'cassandra-2.2' into cassandra-3.0