| commit | 86a9f738ac354ac3166eabd6f6002421fe6f19fc | [log] [tgz] |
|---|---|---|
| author | Josh Elser <elserj@apache.org> | Mon Mar 10 18:15:28 2014 -0400 |
| committer | Josh Elser <elserj@apache.org> | Mon Mar 10 18:15:28 2014 -0400 |
| tree | c629f989d1d3bbe7fa958d65932d45c4d2827195 | |
| parent | 1c83a2aff0210b60be59bb43a01fb3ddad418ff2 [diff] | |
| parent | 96e75c066a566f5061805de90208d4d98c1e3e55 [diff] |
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java test/src/test/java/org/apache/accumulo/test/ShellServerIT.java