accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ujustgotbi...@apache.org
Subject [39/50] git commit: ACCUMULO-1168 Merge back change to CHANGES from 1.4.3rc2 tag
Date Thu, 06 Feb 2014 05:40:18 GMT
ACCUMULO-1168 Merge back change to CHANGES from 1.4.3rc2 tag


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1457375 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/5a855a87
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/5a855a87
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/5a855a87

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 5a855a8787ade93c913f78c80e4c3ee598173922
Parents: 06c5249 9986235
Author: Josh Elser <elserj@apache.org>
Authored: Sun Mar 17 05:11:28 2013 +0000
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Mar 17 05:11:28 2013 +0000

----------------------------------------------------------------------
 ingest/bin/ingest.sh          | 2 +-
 ingest/bin/ingest_parallel.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/5a855a87/ingest/bin/ingest.sh
----------------------------------------------------------------------
diff --cc ingest/bin/ingest.sh
index 8dca09c,54ed26f..3eb5df4
--- a/ingest/bin/ingest.sh
+++ b/ingest/bin/ingest.sh
@@@ -38,7 -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.3.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

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/5a855a87/ingest/bin/ingest_parallel.sh
----------------------------------------------------------------------
diff --cc ingest/bin/ingest_parallel.sh
index 2f2bb5b,0a31926..c2ef4b3
--- a/ingest/bin/ingest_parallel.sh
+++ b/ingest/bin/ingest_parallel.sh
@@@ -38,7 -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.3.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


Mime
View raw message