| commit | b5a2b65076f86ee03ccd6083a6ccafae0c4c6f1d | [log] [tgz] |
|---|---|---|
| author | Jason Brown <jasedbrown@gmail.com> | Thu Jan 30 09:58:36 2014 -0800 |
| committer | Jason Brown <jasedbrown@gmail.com> | Thu Jan 30 09:58:36 2014 -0800 |
| tree | c9b993923475bfa5af074dd1b0bcb5c50e832b5e | |
| parent | 81fcc33d9d483d27d38348f7aed582f3621cedbd [diff] | |
| parent | 6ad995e8fa7703e082ea9ce67dc4c1ed0b1fd18a [diff] |
Merge branch 'cassandra-1.2' into cassandra-2.0