You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/06/26 13:46:55 UTC

[1/3] cassandra git commit: Fix generate-eclipse-files ant target

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 676099e1c -> 3200d6ce6
  refs/heads/trunk 4d4b33a59 -> 00a34c791


Fix generate-eclipse-files ant target


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

Branch: refs/heads/cassandra-2.2
Commit: 3200d6ce662857e6821062daff4884fc3e7a3b9b
Parents: 676099e
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 26 12:42:01 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 26 12:42:01 2015 +0100

----------------------------------------------------------------------
 build.xml | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3200d6ce/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2723b4d..2eb2d89 100644
--- a/build.xml
+++ b/build.xml
@@ -1904,9 +1904,6 @@
  	 <fileset dir="build/lib/jars">
   	    <include name="**/*.jar" />
   	 </fileset>
-  	 <fileset dir="tools/lib">
-  	     <include name="**/*.jar" />
-  	 </fileset>
   	</path>
   	<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
   	<script language="javascript" classpathref="cassandra.classpath"> <![CDATA[


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

Posted by sa...@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/00a34c79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a34c79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00a34c79

Branch: refs/heads/trunk
Commit: 00a34c791e652d391fd03e74a87e33de3bced0b7
Parents: 4d4b33a 3200d6c
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 26 12:42:20 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 26 12:42:20 2015 +0100

----------------------------------------------------------------------
 build.xml | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


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


[2/3] cassandra git commit: Fix generate-eclipse-files ant target

Posted by sa...@apache.org.
Fix generate-eclipse-files ant target


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

Branch: refs/heads/trunk
Commit: 3200d6ce662857e6821062daff4884fc3e7a3b9b
Parents: 676099e
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 26 12:42:01 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 26 12:42:01 2015 +0100

----------------------------------------------------------------------
 build.xml | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3200d6ce/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2723b4d..2eb2d89 100644
--- a/build.xml
+++ b/build.xml
@@ -1904,9 +1904,6 @@
  	 <fileset dir="build/lib/jars">
   	    <include name="**/*.jar" />
   	 </fileset>
-  	 <fileset dir="tools/lib">
-  	     <include name="**/*.jar" />
-  	 </fileset>
   	</path>
   	<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
   	<script language="javascript" classpathref="cassandra.classpath"> <![CDATA[