| commit | de24ee94f355042f24f04c3dec8c1c50000e4ec3 | [log] [tgz] |
|---|---|---|
| author | Carl Yeksigian <carl@apache.org> | Wed Feb 03 09:29:20 2016 -0500 |
| committer | Carl Yeksigian <carl@apache.org> | Wed Feb 03 09:29:20 2016 -0500 |
| tree | 857928b708488168673693d33b59c03f3dd4e139 | |
| parent | 78fe8c487b53939c933718bc4e470b78e677df51 [diff] | |
| parent | 5f1e4bcad7d36feb97096c6149ad3c43f26f0fd9 [diff] |
Merge branch 'cassandra-3.0' into cassandra-3.3