| commit | 5db844b1d4eeef19be6bee61a0565ce65b789c3b | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Fri May 02 18:38:51 2014 -0400 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Fri May 02 18:38:51 2014 -0400 |
| tree | 5acb335b3761c6a75a2404e64972ee27c76e70d7 | |
| parent | 2f3bee971a3f46a0b0534581aa82bd25ca4e5a28 [diff] | |
| parent | 7bacc067c5f96e223834b7047291875900c7c0c8 [diff] |
Merge branch '1.6.1-SNAPSHOT' 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