Author: ecn
Date: Fri Mar 1 20:06:30 2013
New Revision: 1451703
URL: http://svn.apache.org/r1451703
Log:
ACCUMULO-1038 commiting patch provided by Michael Berman
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/docs/src/user_manual/chapters/table_configuration.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/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1451700-1451701
Merged /accumulo/branches/1.4:r1451700
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/assemble:r1451700
Merged /accumulo/branches/1.5/assemble:r1451700-1451701
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1451700-1451701
Merged /accumulo/branches/1.4/core:r1451700
Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
URL:
http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1451703&r1=1451702&r2=1451703&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
(original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Fri
Mar 1 20:06:30 2013
@@ -161,8 +161,8 @@ user@myinstance mytable> setiter -t myta
\begin{verbatim}
scanner.addIterator(new IteratorSetting(
15, // priority
- "com.company.MyIterator", // class name
- "myiter" // name this iterator
+ "myiter", // name this iterator
+ "com.company.MyIterator" // class name
));
\end{verbatim}
\normalsize
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1451700-1451701
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:r1451700-1451701
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451700
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:r1451700-1451701
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451700
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1451700
Merged /accumulo/branches/1.5/server:r1451700-1451701
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1451700
Merged /accumulo/branches/1.5/src:r1451700-1451701
