accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1457375 - in /accumulo/branches/1.4: ./ src/ src/core/ src/examples/wikisearch/ingest/bin/ src/server/ src/server/src/ src/server/src/main/java/org/apache/accumulo/server/test/functional/ src/server/src/main/java/org/apache/accumulo/server...
Date Sun, 17 Mar 2013 05:11:28 GMT
Author: elserj
Date: Sun Mar 17 05:11:28 2013
New Revision: 1457375

URL: http://svn.apache.org/r1457375
Log:
ACCUMULO-1168 Merge back change to CHANGES from 1.4.3rc2 tag

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/CHANGES
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
    accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
    accumulo/branches/1.4/src/server/   (props changed)
    accumulo/branches/1.4/src/server/src/   (props changed)
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
  (props changed)
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
  (props changed)

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4:r1356400
  Merged /accumulo/tags/1.4.3rc2:r1455987-1457373
  Merged /accumulo/branches/1.4.3:r1455152-1455173,1455175-1455986

Modified: accumulo/branches/1.4/CHANGES
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/CHANGES?rev=1457375&r1=1457374&r2=1457375&view=diff
==============================================================================
--- accumulo/branches/1.4/CHANGES (original)
+++ accumulo/branches/1.4/CHANGES Sun Mar 17 05:11:28 2013
@@ -23,6 +23,7 @@ Release Notes - Apache Accumulo - Versio
    * [ACCUMULO-872]  - both accumulo and accumulo-native contain native libs
    * [ACCUMULO-776]  - TimestampFilter should serialize start and end as longs in the IteratorSetting
    * [ACCUMULO-364]  - Security Policy file should be an example
+   * [ACCUMULO-1173] - NPE in tracer on zookeeper disconnect
 
 **Improvement 
    * [ACCUMULO-1049] - Master does not need to get tserver lock

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src:r1356400
  Merged /accumulo/branches/1.4.3/src:r1455152-1455173,1455175-1455986
  Merged /accumulo/tags/1.4.3rc2/src:r1455987-1457373

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src/core:r1356400
  Merged /accumulo/branches/1.4.3/src/core:r1455152-1455173,1455175-1455986
  Merged /accumulo/tags/1.4.3rc2/src/core:r1455987-1457373

Modified: accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh?rev=1457375&r1=1457374&r2=1457375&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh Sun Mar 17 05:11:28
2013
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' 
 #
 # Map/Reduce job
 #
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.3-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4-SNAPSHOT.jar
 CONF=$SCRIPT_DIR/../conf/wikipedia.xml
 HDFS_DATA_DIR=$1
 export HADOOP_CLASSPATH=$CLASSPATH

Modified: accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh?rev=1457375&r1=1457374&r2=1457375&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh Sun Mar 17
05:11:28 2013
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' 
 #
 # Map/Reduce job
 #
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.3-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4-SNAPSHOT.jar
 CONF=$SCRIPT_DIR/../conf/wikipedia.xml
 HDFS_DATA_DIR=$1
 export HADOOP_CLASSPATH=$CLASSPATH

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src/server:r1356400
  Merged /accumulo/tags/1.4.3rc2/src/server:r1455987-1457373
  Merged /accumulo/branches/1.4.3/src/server:r1455152-1455173,1455175-1455986

Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src/server/src:r1356400
  Merged /accumulo/tags/1.4.3rc2/src/server/src:r1455987-1457373
  Merged /accumulo/branches/1.4.3/src/server/src:r1455152-1455173,1455175-1455986

Propchange: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1356400
  Merged /accumulo/tags/1.4.3rc2/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1455987-1457373
  Merged /accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1455152-1455173,1455175-1455986

Propchange: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
------------------------------------------------------------------------------
  Reverse-merged /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1356400
  Merged /accumulo/tags/1.4.3rc2/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1455987-1457373
  Merged /accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1455152-1455173,1455175-1455986



Mime
View raw message