| commit | ff56b04bacedfbdd70b4718dd734b487a2d4c8a9 | [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 | efef44e26f30798d7445b82b64e3f2c1690f7496 | |
| parent | 53459c86b6c5e84ccb18981bf56fc01948dfbff9 [diff] | |
| parent | 283c0d48b13795eb3dee4f47034af95608bb9bf9 [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