Author: ctubbsii
Date: Sun May 19 15:31:44 2013
New Revision: 1484297
URL: http://svn.apache.org/r1484297
Log:
ACCUMULO-1354 merge doc updates to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/README
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1484205-1484296
Modified: accumulo/trunk/README
URL:
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1484297&r1=1484296&r2=1484297&view=diff
==============================================================================
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Sun May 19 15:31:44 2013
@@ -24,7 +24,7 @@ Accumulo compiles against Hadoop 1.0.4.
that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". To compile
against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses
-2.0.2-alpha. To compile against a different 2.0-compatible version, specify
+2.0.4-alpha. To compile against a different 2.0-compatible version, specify
the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5".
If you are running on another Unix-like operating system (OSX, etc) then
@@ -88,7 +88,7 @@ Apache Hadoop 0.20.205
Apache Hadoop 0.23.x dfs.support.append true
Apache Hadoop 1.0.x dfs.support.append false
Apache Hadoop 1.1.x dfs.durable.sync true
-Apache Hadoop 2.0.0-2.0.2 dfs.support.append true
+Apache Hadoop 2.0.0-2.0.4 dfs.support.append true
Cloudera CDH 3u0-3u3 ???? true
Cloudera CDH 3u4 dfs.support.append true
Hortonworks HDP `1.0 dfs.support.append false
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1484205-1484296
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1484205-1484296
Modified:
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
URL:
http://svn.apache.org/viewvc/accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex?rev=1484297&r1=1484296&r2=1484297&view=diff
==============================================================================
---
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
(original)
+++
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
Sun May 19 15:31:44 2013
@@ -29,7 +29,7 @@ of the different ways to execute client
In order to run client code written to run against Accumulo, you will need to
include the jars that Accumulo depends on in your classpath. Accumulo client
-code depends on Hadoop and Zookeeper. For Hadoop add the hadoop core jar, all
+code depends on Hadoop and Zookeeper. For Hadoop add the hadoop client jar, all
of the jars in the Hadoop lib directory, and the conf directory to the
classpath. For Zookeeper 3.3 you only need to add the Zookeeper jar, and not
what is in the Zookeeper lib directory. You can run the following command on a
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1484205-1484296
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1484205-1484296
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1484205-1484296
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1484205-1484296
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1484205-1484296
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1484205-1484296
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1484205-1484296
