| commit | 733d9dc2ce236aba6025d3004ded8628c444ebac | [log] [tgz] |
|---|---|---|
| author | Josh Elser <elserj@apache.org> | Tue Jul 07 22:39:41 2015 -0400 |
| committer | Josh Elser <elserj@apache.org> | Tue Jul 07 22:39:41 2015 -0400 |
| tree | ba27e9df427481e30a1db4ac89e20295dcdf7e2d | |
| parent | 3ea1c8be50b8f4054890fd55f2e8c719ce7827ba [diff] | |
| parent | fcb3581387ad016e32a8b8fc58f2bf5b42170962 [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