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