Merge branch 'master' into transactional-spout

Nathan Marz · Nathan Marz · commit 2ba30d21159d · 2012-01-28T22:49:09.000-08:00
diff --git a/bin/javadoc.sh b/bin/javadoc.sh
@@ -1,2 +1,2 @@
 mkdir -p doc
-javadoc -d doc/ `find src -name "*.java" | grep -v generated`
+javadoc -d doc-$1/ `find src -name "*.java" | grep -v generated`

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`mkdir -p doc`
`2`		-javadoc -d doc/ `find src -name "*.java" \| grep -v generated`
	`2`	+javadoc -d doc-$1/ `find src -name "*.java" \| grep -v generated`