accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.6'
Date Fri, 27 Feb 2015 17:12:38 GMT
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 4e400f0d2a14a9753152276b663ec73a23383722
Parents: bac5bc5 9dcfa63
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Feb 27 12:11:59 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Feb 27 12:11:59 2015 -0500

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e400f0d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9ea3bee,089901b..d8c6d02
--- a/pom.xml
+++ b/pom.xml
@@@ -639,8 -612,10 +639,8 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-release-plugin</artifactId>
 -          <!-- Work around MRELEASE-812 -->
 -          <version>2.5</version>
            <configuration>
-             <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2
-Dmavanagaiata.dirtyFlag=false</arguments>
+             <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
              <goals>clean deploy</goals>
              <preparationGoals>clean verify</preparationGoals>


Mime
View raw message