| commit | d4195803587a58f01604d82a3fe9560dc1a2f791 | [log] [tgz] |
|---|---|---|
| author | Josh Elser <elserj@apache.org> | Fri Jan 29 12:14:37 2016 -0500 |
| committer | Josh Elser <elserj@apache.org> | Fri Jan 29 12:14:37 2016 -0500 |
| tree | ea7f29a255d385a47db941e514bc588607a13558 | |
| parent | cc565f93e292eb2d71108190bb373cb04ce2873f [diff] | |
| parent | 610654f0e1a1b3b01478eec6d8cbe2d52a3c42bb [diff] |
Merge branch '1.6' into 1.7 Conflicts: examples/simple/.gitignore fate/.gitignore maven-plugin/.gitignore minicluster/.gitignore pom.xml proxy/.gitignore server/tracer/.gitignore trace/.gitignore