[15/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-10 Thread elserj
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

[15/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-04 Thread mdrob
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9abf9424 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9abf9424 Diff: http://git-wip-us.apache.org/repos/asf/