You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/11 20:40:28 UTC

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e2a06d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e2a06d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e2a06d0

Branch: refs/heads/1.7
Commit: 5e2a06d005e9cac6f492ae94f8c39b0020448ed7
Parents: 9bac8dd c4eff0c
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon May 11 14:39:45 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon May 11 14:39:45 2015 -0400

----------------------------------------------------------------------
 docs/src/main/resources/administration.html | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------