Merge branch '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/858288ba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/858288ba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/858288ba Branch: refs/heads/master Commit: 858288ba90d32033daa823c186110b16ae1336e2 Parents: e10d1a7 0309df8 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Apr 25 11:27:45 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Apr 25 11:27:45 2014 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
