You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2017/06/15 19:09:34 UTC

[1/5] cassandra git commit: Switch MAT to fetch jars from repo.maven.apache.org

Repository: cassandra
Updated Branches:
  refs/heads/trunk 32b60592c -> e0eac5264


Switch MAT to fetch jars from repo.maven.apache.org


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

Branch: refs/heads/trunk
Commit: fdb8c96108f9d8d72bc3a6a56d35e708f371a995
Parents: b0db519
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Jun 15 14:03:06 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Jun 15 14:03:06 2017 -0500

----------------------------------------------------------------------
 build.properties.default | 2 +-
 build.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdb8c961/build.properties.default
----------------------------------------------------------------------
diff --git a/build.properties.default b/build.properties.default
index 45d65d9..5291659 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -1,4 +1,4 @@
 # Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
 artifact.remoteRepository.central:     http://repo1.maven.org/maven2
-artifact.remoteRepository.apache:      https://repository.apache.org/content/repositories/releases
+artifact.remoteRepository.apache:      http://repo.maven.apache.org/maven2
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdb8c961/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6d64025..6619bfd 100644
--- a/build.xml
+++ b/build.xml
@@ -251,6 +251,8 @@
         <artifact:dependencies pathId="wikitext.classpath">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
+            <remoteRepository refid="central"/>
+            <remoteRepository refid="apache"/>
         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ms...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5b8ae9f03943f167932b896c657f25b0d9c3448d
Parents: 1f54aa4 13e153b
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Jun 15 14:06:30 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Jun 15 14:06:30 2017 -0500

----------------------------------------------------------------------
 build.properties.default | 2 +-
 build.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b8ae9f0/build.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ms...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 13e153b090cdebd549d0d1a224c231e9fc1abbe1
Parents: f49579d fdb8c96
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Jun 15 14:06:17 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Jun 15 14:06:17 2017 -0500

----------------------------------------------------------------------
 build.properties.default | 2 +-
 build.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/13e153b0/build.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 5ea7f7c6f2f3abf4faf5d91a046239806ee010a4
Parents: 2a0890d 5b8ae9f
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Jun 15 14:06:45 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Jun 15 14:06:45 2017 -0500

----------------------------------------------------------------------
 build.properties.default | 2 +-
 build.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ea7f7c6/build.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by ms...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: e0eac52640cd407f3b3595704052a2d2b4f74b48
Parents: 32b6059 5ea7f7c
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Jun 15 14:09:20 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Jun 15 14:09:20 2017 -0500

----------------------------------------------------------------------
 build.properties.default | 2 +-
 build.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0eac526/build.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org