Skip to content
Browse files

merge with apache trunk

  • Loading branch information...
2 parents daded8f + 22279c3 commit 4207bbed5e84eb000734d6e6400b37bf7b305a42 @ekoontz committed Mar 23, 2012
Showing with 13 additions and 2 deletions.
  1. +10 −0 CHANGELOG
  2. +3 −2 bin/giraph
View
10 CHANGELOG
@@ -2,6 +2,16 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-166: add '*.patch' to list of files that Apache Rat ignores
+ (ekoontz via aching).
+
+ GIRAPH-167: mvn -Phadoop_non_secure clean verify fails (ekoontz via
+ aching).
+
+ GIRAPH-163: bin/giraph script overwrites CLASSPATH if "dev
+ environment" detected (this also removes USER_JAR from CLASSPATH)
+ (metaman via aching).
+
GIRAPH-164: fix 5 "Line is longer than 80 characters" style errors
in GiraphRunner (ekoontz via aching).
View
5 bin/giraph
@@ -84,8 +84,9 @@ else
exit 1
fi
- CLASSPATH=`mvn dependency:build-classpath | grep -v "[INFO]"`
-
+ CLASSPATH2=`mvn dependency:build-classpath | grep -v "[INFO]"`
+ CLASSPATH=$CLASSPATH:$CLASSPATH2
+
for f in $GIRAPH_HOME/target/giraph*.jar ; do
if [ -e "$f" ]; then
JAR=$f

0 comments on commit 4207bbe

Please sign in to comment.
Something went wrong with that request. Please try again.