cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Wed, 01 Mar 2017 02:06:49 GMT
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 4bb5ada5358cb4287f445d9d49145e76f2bf3a07
Parents: 895e6ce 760d6c3
Author: Ariel Weisberg <aweisberg@apple.com>
Authored: Tue Feb 28 19:57:57 2017 -0500
Committer: Ariel Weisberg <aweisberg@apple.com>
Committed: Tue Feb 28 19:57:57 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 build.xml   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 8fde61b,dcaa780..e2bbe94
--- a/build.xml
+++ b/build.xml
@@@ -1057,8 -1198,8 +1059,8 @@@
       debug="true"
       debuglevel="${debuglevel}"
       destdir="${test.classes}"
-      includeantruntime="false"
+      includeantruntime="true"
 -     source="${source.version}" 
 +     source="${source.version}"
       target="${target.version}"
       encoding="utf-8">
       <classpath>


Mime
View raw message