You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/08/14 00:13:33 UTC
[1/2] git commit: fix generate-eclipse-files build.xml target on JDK 8
Repository: cassandra
Updated Branches:
refs/heads/trunk 5aaa4a027 -> 048f72bd3
fix generate-eclipse-files build.xml target on JDK 8
Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74e7f28f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74e7f28f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74e7f28f
Branch: refs/heads/trunk
Commit: 74e7f28f7f01adfe8b5cbd493231b0d64d210af8
Parents: 50fc8ba
Author: Joshua McKenzie <jo...@datastax.com>
Authored: Wed Aug 13 17:10:23 2014 -0500
Committer: Joshua McKenzie <jo...@datastax.com>
Committed: Wed Aug 13 17:10:23 2014 -0500
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74e7f28f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 0bff88d..54f5f3d 100644
--- a/build.xml
+++ b/build.xml
@@ -1416,7 +1416,7 @@
</path>
<property name="all-test-classes" refid="all-test-classes-path"/>
<script language="javascript"> <![CDATA[
- importClass(java.lang.Integer)
+ var Integer = java.lang.Integer;
sep = project.getProperty("path.separator");
all = project.getProperty("all-test-classes").split(sep);
dir = project.getProperty("test.unit.src");
@@ -1447,7 +1447,7 @@
task.setTarget("testlist");
param = task.createParam();
param.setName("test.file.list");
- param.setValue(buckets[i]);
+ param.setValue("" + buckets[i]);
param = task.createParam();
param.setName("testlist.name");
@@ -1455,7 +1455,7 @@
param = task.createParam();
param.setName("testlist.offset");
- param.setValue(i);
+ param.setValue("" + i);
p.addTask(task);
}
@@ -1513,7 +1513,7 @@
</path>
<property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
<script language="javascript"> <![CDATA[
- importClass(java.io.File);
+ var File = java.io.File;
jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
cp = "";
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/048f72bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/048f72bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/048f72bd
Branch: refs/heads/trunk
Commit: 048f72bd3e22f69655ec28b03db95c3e48fc5296
Parents: 5aaa4a0 74e7f28
Author: Joshua McKenzie <jo...@datastax.com>
Authored: Wed Aug 13 17:12:24 2014 -0500
Committer: Joshua McKenzie <jo...@datastax.com>
Committed: Wed Aug 13 17:12:24 2014 -0500
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/048f72bd/build.xml
----------------------------------------------------------------------