commit | f77247ee60ac263a827c2f1e97570d7c0fd183e4 | [log] [tgz] |
---|---|---|
author | Christopher Tubbs <ctubbsii@apache.org> | Wed Feb 17 15:56:17 2016 -0500 |
committer | Christopher Tubbs <ctubbsii@apache.org> | Wed Feb 17 15:56:17 2016 -0500 |
tree | be2c89c818faf5c3112030edab4ba29a0164672f | |
parent | ce73a57e04b7aebf9d929c797b6e6e14c44e7f36 [diff] | |
parent | ca84d782bd5e8f512563bc9764f550d25789e4a9 [diff] |
Merge branch '1.6' into 1.7 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