Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e68b8dbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68b8dbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e68b8dbc Branch: refs/heads/master Commit: e68b8dbc61a204e73452f254a5f130ac813c9b78 Parents: c2900a3 2be85ad Author: Sean Busbey <bus...@cloudera.com> Authored: Fri Aug 26 19:23:13 2016 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Fri Aug 26 19:23:13 2016 -0500 ---------------------------------------------------------------------- .../accumulo/server/security/SecurityUtil.java | 30 ++++++++--- .../org/apache/accumulo/tracer/TraceServer.java | 52 ++++++++++++-------- 2 files changed, 53 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e68b8dbc/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java ----------------------------------------------------------------------
