accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [02/15] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Fri, 06 Jun 2014 15:33:11 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	pom.xml


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

Branch: refs/heads/ACCUMULO-378
Commit: bcc387e3d0e9746b2623f757f326f2fc02c53b92
Parents: 3af0642 ea266bb
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jun 5 14:20:37 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jun 5 14:20:37 2014 -0400

----------------------------------------------------------------------
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bcc387e3/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5ecad3d,875b0f4..56cb185
--- a/pom.xml
+++ b/pom.xml
@@@ -599,11 -587,13 +599,18 @@@
            </configuration>
          </plugin>
          <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-surefire-plugin</artifactId>
+           <configuration>
+             <argLine>-Xmx768m</argLine>
+           </configuration>
+         </plugin>
+         <plugin>
 +          <groupId>org.asciidoctor</groupId>
 +          <artifactId>asciidoctor-maven-plugin</artifactId>
 +          <version>0.1.4</version>
 +        </plugin>
 +        <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>build-helper-maven-plugin</artifactId>
            <version>1.8</version>


Mime
View raw message