Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/93a3d5c6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/93a3d5c6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/93a3d5c6 Branch: refs/heads/master Commit: 93a3d5c69fe13659c3b9536e9fa83d43eefae828 Parents: 729b2c5 712504b Author: Josh Elser <els...@apache.org> Authored: Tue Feb 10 18:54:57 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Feb 10 18:54:57 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
