You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/02 16:23:42 UTC
[3/5] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5754ab2
Branch: refs/heads/cassandra-1.2
Commit: d5754ab223116f26749d0df0c942d43c819ff63b
Parents: de212e5 f8567d1
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:12:19 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:12:19 2013 -0400
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5754ab2/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ab4dd71,43172c9..3d76d14
--- a/build.xml
+++ b/build.xml
@@@ -1010,9 -945,12 +1014,11 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
- <pathelement location="${build.classes.cql}"/>
</classpath>
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>