| commit | e37b4a5c5a35a1260f26ef8f3f282ade8ec3be74 | [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 | 21767a46c6176783df15e7d852499725470de902 | |
| parent | b166dbe9e21595ae9ce2d94d64004c092b3ff4c4 [diff] | |
| parent | b81effc3e38e4e1249daa42b82407949553cf6bb [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