| commit | 25159c388bf5270e60775171344d9bf9838bbdb4 | [log] [tgz] |
|---|---|---|
| author | Marcus Eriksson <marcuse@apache.org> | Mon Aug 01 10:41:04 2016 +0200 |
| committer | Marcus Eriksson <marcuse@apache.org> | Mon Aug 01 10:41:04 2016 +0200 |
| tree | a2750968f345339caf2481b7bb6cd16136fd1a38 | |
| parent | 7bd65a129c63091d6885f92afe77a41c4fc46a6f [diff] | |
| parent | bc0d1da0ce2d1ddc766ba99110470c50e7fd8bbe [diff] |
Merge branch 'cassandra-2.1' into cassandra-2.2