accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] git commit: ACCUMULO-1500 Merge branch '1.5.1-SNAPSHOT'
Date Wed, 24 Jul 2013 01:53:47 GMT
ACCUMULO-1500 Merge branch '1.5.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/96bed813
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96bed813
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96bed813

Branch: refs/heads/master
Commit: 96bed81360da4fcc49e0a09a5c575158b35afa32
Parents: 07d1b6e a7bc937
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jul 23 21:50:59 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jul 23 21:50:59 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/96bed813/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ec1c48c,52e1beb..8116876
--- a/pom.xml
+++ b/pom.xml
@@@ -82,13 -82,11 +82,13 @@@
      <module>proxy</module>
      <module>test</module>
      <module>minicluster</module>
 +    <module>docs</module>
 +    <module>maven-plugin</module>
    </modules>
    <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/trunk</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/trunk</developerConnection>
-     <url>http://svn.apache.org/viewvc/accumulo/trunk</url>
+     <connection>scm:git:git://git.apache.org/accumulo.git</connection>
+     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+     <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
    </scm>
    <issueManagement>
      <system>JIRA</system>


Mime
View raw message