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/98e3df21 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98e3df21 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98e3df21 Branch: refs/heads/master Commit: 98e3df21dc952a1f4615b5a049523614544d4b70 Parents: 61e48e6 1291713 Author: John Vines <[email protected]> Authored: Mon Dec 16 13:19:04 2013 -0500 Committer: John Vines <[email protected]> Committed: Mon Dec 16 13:19:04 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/tables/TableManager.java | 5 ++++- .../java/org/apache/accumulo/master/tableOps/CloneTable.java | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
