accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ujustgotbi...@apache.org
Subject [50/50] [abbrv] git commit: Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.0
Date Wed, 19 Mar 2014 16:09:00 GMT
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


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

Branch: refs/heads/master
Commit: 1990979f69c3dc571628e3ef222257fed0d30c2e
Parents: 1d5c80b 73e321e
Author: Bill Slacum <billslacum@koverse.com>
Authored: Wed Mar 19 12:01:06 2014 -0400
Committer: Bill Slacum <billslacum@koverse.com>
Committed: Wed Mar 19 12:01:06 2014 -0400

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/1990979f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 894a132,6be16f0..c62609a
--- a/pom.xml
+++ b/pom.xml
@@@ -189,14 -63,14 +189,14 @@@
          <executions>
            <execution>
              <id>enforce-mvn</id>
 +            <goals>
 +              <goal>enforce</goal>
 +            </goals>
              <configuration>
                <rules>
-                 <DependencyConvergence />
+                 <DependencyConvergence/>
                </rules>
              </configuration>
 -            <goals>
 -              <goal>enforce</goal>
 -            </goals>
            </execution>
          </executions>
        </plugin>


Mime
View raw message