gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [29/50] [abbrv] git commit: Merge remote-tracking branch 'upstream/master' into GORA_199
Date Wed, 04 Jun 2014 16:36:46 GMT
Merge remote-tracking branch 'upstream/master' into GORA_199

Conflicts:
	gora-accumulo/pom.xml
	gora-cassandra/pom.xml
	gora-compiler-cli/pom.xml
	gora-compiler/pom.xml
	gora-core/pom.xml
	gora-hbase/pom.xml
	gora-solr/pom.xml
	gora-tutorial/pom.xml
	pom.xml
	sources-dist/pom.xml


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

Branch: refs/heads/master
Commit: 5a5f527e9dc94fd2e55216fc8465bdd43a47c13c
Parents: 14d1f04 f5917b3
Author: Damien Raude-Morvan <damien@dictanova.com>
Authored: Tue May 20 14:58:05 2014 +0200
Committer: Damien Raude-Morvan <damien@dictanova.com>
Committed: Tue May 20 14:58:05 2014 +0200

----------------------------------------------------------------------
 gora-accumulo/pom.xml     |  5 -----
 gora-cassandra/pom.xml    |  5 -----
 gora-compiler-cli/pom.xml |  5 -----
 gora-compiler/pom.xml     |  5 -----
 gora-core/pom.xml         |  5 -----
 gora-hbase/pom.xml        |  5 -----
 gora-solr/pom.xml         | 18 ++++++++++++++++++
 gora-tutorial/pom.xml     |  5 -----
 pom.xml                   |  6 ++++++
 sources-dist/pom.xml      |  5 -----
 10 files changed, 24 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/5a5f527e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 6cab9e8,ff7e2f7..98e69b1
--- a/pom.xml
+++ b/pom.xml
@@@ -241,9 -241,9 +241,15 @@@
    </mailingLists>
         
    <scm>
++<<<<<<< HEAD
 +    <connection>scm:svn:http://svn.apache.org/repos/asf/gora/trunk/</connection>
 +    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/gora/trunk/</developerConnection>
 +    <url>http://svn.apache.org/viewvc/gora/trunk/</url>
++=======
+     <connection>scm:git:http://git-wip-us.apache.org/repos/asf/gora.git</connection>
+     <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/gora.git</developerConnection>
+     <url>https://git-wip-us.apache.org/repos/asf/gora.git</url>
++>>>>>>> upstream/master
    </scm>
    <issueManagement>
      <system>JIRA</system>


Mime
View raw message