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/fdc33170
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fdc33170
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fdc33170

Branch: refs/heads/master
Commit: fdc331705320175a23cebcb5d2abed834016227d
Parents: 5a8669a b19de71
Author: Josh Elser <els...@apache.org>
Authored: Wed Sep 28 12:46:52 2016 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Wed Sep 28 12:46:52 2016 -0400

----------------------------------------------------------------------
 .../main/asciidoc/chapters/administration.txt    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fdc33170/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --cc docs/src/main/asciidoc/chapters/administration.txt
index a2dab8e,de8920a..1a06d06
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@@ -63,20 -63,20 +63,23 @@@ In addition, the user can provide +0+ a
  ephemeral port is likely to be unique and not already bound. Thus, 
configuring ports to
  use +0+ instead of an explicit value, should, in most cases, work around any 
issues of
  running multiple distinct Accumulo instances (or any other process which 
tries to use the
 -same default ports) on the same hardware.
 +same default ports) on the same hardware. Finally, the *.port.client 
properties will work
 +with the port range syntax (M-N) allowing the user to specify a range of 
ports for the
 +service to attempt to bind. The ports in the range will be tried in a 1-up 
manner starting
 +at the low end of the range to, and including, the high end of the range.
  
  === Installation
- Choose a directory for the Accumulo installation. This directory will be 
referenced
- by the environment variable +$ACCUMULO_HOME+. Run the following:
  
-   $ tar xzf accumulo-1.6.0-bin.tar.gz    # unpack to subdirectory
-   $ mv accumulo-1.6.0 $ACCUMULO_HOME # move to desired location
+ Download a binary distribution of Accumulo and install it to a directory on a 
disk with
+ sufficient space:
  
- Repeat this step at each machine within the cluster. Usually all machines 
have the
- same +$ACCUMULO_HOME+.
+   cd <install directory>
+   tar xzf accumulo-X.Y.Z-bin.tar.gz   # Replace 'X.Y.Z' with your Accumulo 
version
+   cd accumulo-X.Y.Z
+ 
+ Repeat this step on each machine in your cluster. Typically, the same 
+<install directory>+
+ is chosen for all machines in the cluster. When you configure Accumulo, the 
+$ACCUMULO_HOME+
+ environment variable should be set to +/path/to/<install 
directory>/accumulo-X.Y.Z+.
  
  === Dependencies
  Accumulo requires HDFS and ZooKeeper to be configured and running

Reply via email to