Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acf68ad5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/acf68ad5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/acf68ad5 Branch: refs/heads/master Commit: acf68ad5110edb4e9ab38ca097aa0a9e34d8e370 Parents: 3cb1e7c fb46488 Author: Josh Elser <els...@apache.org> Authored: Wed Dec 30 21:15:30 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Dec 30 21:15:30 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/admin/TableOperations.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/acf68ad5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ----------------------------------------------------------------------