Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5257b80a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5257b80a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5257b80a Branch: refs/heads/master Commit: 5257b80abb34d3843d9a6958e41f06979ea30139 Parents: ad4ea6b 3af0642 Author: Josh Elser <[email protected]> Authored: Thu Jun 5 13:33:30 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Jun 5 13:33:30 2014 -0400 ---------------------------------------------------------------------- .../core/client/mock/MockTableOperationsTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ----------------------------------------------------------------------
