| commit | 8875a8fcd154e5a1c72310749de50eeb1a422118 | [log] [tgz] |
|---|---|---|
| author | r0ann3l <roannel.fdez@gmail.com> | Fri Sep 27 11:32:15 2019 -0400 |
| committer | r0ann3l <roannel.fdez@gmail.com> | Fri Sep 27 11:32:15 2019 -0400 |
| tree | bc8fcd90bf15090b92ca82cd64536648b59b62f3 | |
| parent | 026d2e783cce2372c2e2ba426afc0effd8b7dd25 [diff] | |
| parent | caa94228614b0d63049a41978939d9a1e2f729d3 [diff] |
Merge branch 'master' into NUTCH-2732
diff --git a/.gitignore b/.gitignore index 5462dbf..3e3bad2 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,5 +1,6 @@ conf/*.txt conf/*.xml +!conf/nutch-default.xml conf/hadoop-env.sh conf/slaves build/
diff --git a/conf/nutch-default.xml.template b/conf/nutch-default.xml similarity index 100% rename from conf/nutch-default.xml.template rename to conf/nutch-default.xml