[12/14] Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-07 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dea61a07/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 5e6a353,000..9e9f511

[12/14] Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-03 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a34937a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java -- diff --cc server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderT