| commit | 32baa4ab371272dbda6ec110a23a42634cf30059 | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Thu Jun 25 11:50:43 2015 -0400 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Thu Jun 25 11:50:43 2015 -0400 |
| tree | ab36857330334ad253f889a5ccdb25f79c35362e | |
| parent | 18d68fcce5ff54ceb8a47ec5cfd3156f6ac862ba [diff] | |
| parent | 9009d4897800a6a85e6a35297f9dd9880415a187 [diff] |
Merge tag '1.5.3' into 1.6 (no changes) Conflicts: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml minicluster/pom.xml pom.xml proxy/pom.xml server/tserver/pom.xml start/pom.xml test/pom.xml trace/pom.xml