| commit | a394fdf4d475810d0665510367e5355f460bd87a | [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 | 018a18045c7f631f99dca78cb3979643021db0b2 | |
| parent | 410657ee442db3a5e4dcb0ffdb9286d07b30e90f [diff] | |
| parent | 35e1d6728694bc4ed1b45526c665bc016177c2ae [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