Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96182f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96182f93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96182f93 Branch: refs/heads/ACCUMULO-2061 Commit: 96182f93f3105b047c63206c702a5313e9ca5535 Parents: 7cb3b23 6dd1bd3 Author: Josh Elser <els...@apache.org> Authored: Wed Mar 12 13:01:05 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Mar 12 13:01:05 2014 -0400 ---------------------------------------------------------------------- init/src/main/packaging/etc/accumulo/tracers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------