| commit | 9d26a64063ecfa998f2ff407462ee728a1f4c33a | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Thu Sep 25 20:57:51 2014 -0400 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Thu Sep 25 20:57:51 2014 -0400 |
| tree | 20e618b2772fa22b0393ab6c9c02f5005e60606a | |
| parent | f6858a131f17230bae0dfdad493e2231059f1532 [diff] | |
| parent | 949b83b633e0325196651d388f2602d1189ed456 [diff] |
Merge branch '1.6.2-SNAPSHOT' Conflicts: assemble/pom.xml core/pom.xml docs/pom.xml examples/simple/pom.xml fate/pom.xml maven-plugin/pom.xml minicluster/pom.xml pom.xml proxy/pom.xml server/base/pom.xml server/gc/pom.xml server/master/pom.xml server/monitor/pom.xml server/native/pom.xml server/tracer/pom.xml server/tserver/pom.xml start/pom.xml test/pom.xml trace/pom.xml