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/77568bc3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77568bc3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77568bc3 Branch: refs/heads/master Commit: 77568bc36c1219d7a13b1913f7a02d55f946b69f Parents: 217264f c35b70c Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 17 10:23:56 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 17 10:23:56 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
