commit | c1c8a5a78a1123a26e257023f533d17432d13b2f | [log] [tgz] |
---|---|---|
author | Corey J. Nolet <cjnolet@gmail.com> | Mon Feb 16 09:48:35 2015 -0500 |
committer | Corey J. Nolet <cjnolet@gmail.com> | Mon Feb 16 09:48:35 2015 -0500 |
tree | 55cb74665df49bc75c186a26c3b214cbc46b8348 | |
parent | 24299e4fe6c57ab771b50f34855df81c241ce7c3 [diff] | |
parent | 37847ac12168f0c430f535fd4f7b561ffc707d6b [diff] |
Merge branch '1.6' 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