You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/07/07 16:48:54 UTC
[1/3] cassandra git commit: remove extra ant dep from build
Repository: cassandra
Updated Branches:
refs/heads/trunk 87c6daf6e -> db68d1cfd
remove extra ant dep from build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4de943fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4de943fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4de943fd
Branch: refs/heads/trunk
Commit: 4de943fd9cf40e21f4d2cda7e41b0127442534ac
Parents: db39257
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Jul 7 10:46:13 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Jul 7 10:46:13 2015 -0400
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4de943fd/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index bbb64a2..cf9788a 100644
--- a/build.xml
+++ b/build.xml
@@ -388,6 +388,7 @@
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
+ <exclusion groupId="ant" artifactId="ant"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
<dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d31068d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d31068d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d31068d
Branch: refs/heads/trunk
Commit: 7d31068da952fb2990226057b52d17fb93f4eaa8
Parents: ebc50d7 4de943f
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Jul 7 10:47:36 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Jul 7 10:47:36 2015 -0400
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d31068d/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 2300ca3,cf9788a..360accf
--- a/build.xml
+++ b/build.xml
@@@ -360,8 -388,7 +360,9 @@@
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
- <exclusion groupId="ant" artifactId="ant"/>
+ <exclusion groupId="commons-logging" artifactId="commons-logging"/>
+ <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
++ <exclusion groupId="ant" artifactId="ant"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
<dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db68d1cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db68d1cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db68d1cf
Branch: refs/heads/trunk
Commit: db68d1cfd60349b8ab24c386f8e4d305dc06ae45
Parents: 87c6daf 7d31068
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Jul 7 10:48:42 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Jul 7 10:48:42 2015 -0400
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db68d1cf/build.xml
----------------------------------------------------------------------