| commit | 04357d6c5cce0d371264d09c834b9c43729f71cb | [log] [tgz] |
|---|---|---|
| author | Michael Figuiere <mfiguiere@datastax.com> | Thu Aug 21 22:47:22 2014 -0700 |
| committer | Michael Figuiere <mfiguiere@datastax.com> | Thu Aug 21 22:47:22 2014 -0700 |
| tree | c3dd0f72ad948765be61564267d4786fde0f5cb4 | |
| parent | 4138c9ab2224d66785bb1ecbaa5a9a9b6da26f8b [diff] | |
| parent | c3d52ee9027a914cde1026eba4bfe1adb4d23a1f [diff] |
Merge branch '2.0' into 2.1