You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/07/02 05:29:15 UTC
[3/3] accumulo git commit: Merge branch '1.7'
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560b3a5d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560b3a5d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560b3a5d
Branch: refs/heads/master
Commit: 560b3a5d1de765ce25d4045972c71f2a9c09be6f
Parents: c088a85 a3722ca
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 1 23:28:56 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jul 1 23:28:56 2015 -0400
----------------------------------------------------------------------
assemble/conf/templates/client.conf | 20 ++++++++++++++++
.../main/asciidoc/chapters/administration.txt | 25 +++++++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------