Merge branch '1.5.2-SNAPSHOT' into 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/956f19b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/956f19b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/956f19b5 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 956f19b5f4745a6af98993ccf3929f5af02ce930 Parents: f4454a0 83ef6b8 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Apr 25 13:43:30 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Apr 25 13:43:30 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/admin/TableOperations.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/956f19b5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ----------------------------------------------------------------------
