svn commit: r1467468 - in /accumulo/trunk: ./ assemble/ core/ docs/src/user_manual/chapters/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/system/continuous/

[ctubbsii]

Author: ctubbsii
Date: Fri Apr 12 21:17:57 2013
New Revision: 1467468

URL: http://svn.apache.org/r1467468
Log:
ACCUMULO-970 update merges to trunk

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/pom.xml   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/system/continuous/agitator.pl

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/assemble:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/core:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

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=1467468&r1=1467467&r2=1467468&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex 
(original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Fri 
Apr 12 21:17:57 2013
@@ -375,10 +375,10 @@ foo day:20080103 []    1
 \normalsize
 
 Accumulo includes some useful Combiners out of the box.  To find these look in
-the\\ \textbf{org.apache.accumulo.core.iterators.user} package.
+the\\ \texttt{org.apache.accumulo.core.iterators.user} package.
 
 Additional Combiners can be added by creating a Java class that extends\\
-\textbf{org.apache.accumulo.core.iterators.Combiner} and adding a jar 
containing that
+\texttt{org.apache.accumulo.core.iterators.Combiner} and adding a jar 
containing that
 class to Accumulo's lib/ext directory.
 
 An example of a Combiner can be found under\\

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/examples:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

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:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

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:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1467393-1467443,1467445-1467465

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/server:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/src:r1467110-1467310,1467313-1467347,1467349,1467351-1467382,1467384-1467443,1467445-1467465

Modified: accumulo/trunk/test/system/continuous/agitator.pl
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/agitator.pl?rev=1467468&r1=1467467&r2=1467468&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/agitator.pl (original)
+++ accumulo/trunk/test/system/continuous/agitator.pl Fri Apr 12 21:17:57 2013
@@ -133,7 +133,7 @@ while(1){
        print STDERR "$t Running tup\n";
        system("$ACCUMULO_HOME/bin/tup.sh");
        print STDERR "$t Running start-dfs\n";
-       system("$HADOOP_PREFIX/bin/start-dfs.sh");
+       system("$HADOOP_PREFIX/*bin/start-dfs.sh");
 
   $nextsleep1 = int(rand($sleep1max - $sleep1)) + $sleep1;
   sleep($nextsleep1 * 60);