Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9290ed3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9290ed3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9290ed3c Branch: refs/heads/master Commit: 9290ed3c5a88bb16a92980596c36ec27d1c3f619 Parents: 485c923 acf68ad Author: Josh Elser <els...@apache.org> Authored: Wed Dec 30 21:15:34 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Dec 30 21:15:34 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/9290ed3c/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ----------------------------------------------------------------------