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:44 UTC
[5/5] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ef11b4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ef11b4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ef11b4b
Branch: refs/heads/cassandra-1.2
Commit: 2ef11b4b6d67acf7cc66c1e256a750291f504484
Parents: dedeb0b b4b4f6a
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:23:08 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:23:08 2013 -0400
----------------------------------------------------------------------
build.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ef11b4b/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index c8407b2,b77c417..05a6c84
--- a/build.xml
+++ b/build.xml
@@@ -1017,7 -1015,8 +1021,9 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false">
++ includeantruntime="false"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>