| commit | 1990979f69c3dc571628e3ef222257fed0d30c2e | [log] [tgz] |
|---|---|---|
| author | Bill Slacum <billslacum@koverse.com> | Wed Mar 19 12:01:06 2014 -0400 |
| committer | Bill Slacum <billslacum@koverse.com> | Wed Mar 19 12:01:06 2014 -0400 |
| tree | 27e214c02f266743f2d4f809bad3996d451cb408 | |
| parent | 1d5c80bedc973aa081ed9a7570a08651a03eb76c [diff] | |
| parent | 73e321e0e9dfb9cd5efe00cefd0c6f1eb9fa3242 [diff] |
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.0 Conflicts: ingest/bin/ingest_parallel.sh ingest/pom.xml pom.xml query/pom.xml
diff --git a/pom.xml b/pom.xml index 894a132..c62609a 100644 --- a/pom.xml +++ b/pom.xml
@@ -194,7 +194,7 @@ </goals> <configuration> <rules> - <DependencyConvergence /> + <DependencyConvergence/> </rules> </configuration> </execution>