Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a005113 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a005113 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a005113 Branch: refs/heads/1.8 Commit: 3a005113a58ef15f5f49863aa48823c4c4c352ee Parents: d99158f 94bb593 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jun 12 22:41:08 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jun 12 22:41:08 2017 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/impl/AccumuloServerException.java | 4 ++++ .../apache/accumulo/core/client/impl/TableOperationsImpl.java | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a005113/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ----------------------------------------------------------------------