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/c95030cc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c95030cc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c95030cc Branch: refs/heads/master Commit: c95030cc96a55818fbb50c77df3df478c45a6466 Parents: 6a78fbd d1b53ed Author: Josh Elser <josh.el...@gmail.com> Authored: Fri Jan 10 18:31:12 2014 -0500 Committer: Josh Elser <josh.el...@gmail.com> Committed: Fri Jan 10 18:31:12 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/util/shell/commands/ExecfileCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------