| commit | ff10d636c7f379d2882b7f863eadbdd0ffacdc6c | [log] [tgz] |
|---|---|---|
| author | Benedict Elliott Smith <benedict@apache.org> | Sat May 16 11:01:57 2015 +0100 |
| committer | Benedict Elliott Smith <benedict@apache.org> | Sat May 16 11:01:57 2015 +0100 |
| tree | 22d8a9df50e37187c5600618ecc1b0770027217e | |
| parent | f76bfd4f3f895ba8e330becbc5dbf61162f2705f [diff] | |
| parent | 8ad70cf257c63114b65cb1c32f56caf14290579f [diff] |
Merge branch 'cassandra-2.1' into cassandra-2.2