| commit | 5d5401d67d8e3fc42eb5a2b6d404fb193863c36d | [log] [tgz] |
|---|---|---|
| author | Jason Brown <jasobrown@apple.com> | Fri Sep 05 16:47:06 2014 -0700 |
| committer | Jason Brown <jasobrown@apple.com> | Fri Sep 05 16:47:06 2014 -0700 |
| tree | 57854af25ff8a1d0a7da0d5b6562fd5fd69e2a7b | |
| parent | c1dc378e0afd848452bc2abde7e0fcbbb0d0801f [diff] | |
| parent | e6f307f4e5be4bf2cd18e153d28e2310e5f8d3da [diff] |
Merge branch 'cassandra-2.0' into cassandra-2.1.0