| commit | 9f8c45d6d6b8581bde536475d366b7783f9a7767 | [log] [tgz] |
|---|---|---|
| author | Tyler Hobbs <tylerlhobbs@gmail.com> | Fri May 15 11:41:25 2015 -0500 |
| committer | Tyler Hobbs <tylerlhobbs@gmail.com> | Fri May 15 11:41:25 2015 -0500 |
| tree | fe447436e82f03f3103d9d168cc90c70d09481c8 | |
| parent | 7d6a60ddd0e156f6028c05d97fa9179f86fe02ee [diff] | |
| parent | 0b92967d3046ce7893106fd587fc553badc12280 [diff] |
Merge branch 'cassandra-2.0' into cassandra-2.1