commit | 7f663b56e84692b526518cdf4c2c1d922cf98d1c | [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 | 25f26fc45dca04124ddb897c1caa6b0cdd3d200c | |
parent | bd2afc219b25e7e100b97bbf93a9b094d271574f [diff] | |
parent | 7082ffdbe516aea98219a96efbc8754a4fcb3cfa [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