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/3043c220 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3043c220 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3043c220 Branch: refs/heads/master Commit: 3043c22020cb7df4b959e637ba6d59eab0df9362 Parents: 9b7f189 1a66f3b Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Feb 18 09:47:51 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Feb 18 09:47:51 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 + .../main/java/org/apache/accumulo/master/tableOps/DeleteTable.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3043c220/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
