| commit | 38a04eab6a18fe81e91cd0b7ecf00c34c443f2b5 | [log] [tgz] |
|---|---|---|
| author | T Jake Luciani <jake@apache.org> | Wed Apr 01 10:45:51 2015 -0400 |
| committer | T Jake Luciani <jake@apache.org> | Wed Apr 01 10:45:51 2015 -0400 |
| tree | 2c0ee926315b2e2f4ccaeae2558426efffa4dcb2 | |
| parent | 2cf4ca3a94ff972b422f1be1a2d601d07ff31a12 [diff] | |
| parent | 2433068c157cd21d4217c98ec5c0b9a2c07e288d [diff] |
Merge branch 'cassandra-2.0.14-build' into cassandra-2.0 Conflicts: CHANGES.txt build.xml debian/changelog