cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 20 Nov 2015 12:17:19 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.1
Commit: 0c04a6bc5b0bce5f9c3f2e49964e163e2500841a
Parents: d1ad796 3851670
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 20 13:15:38 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 20 13:15:38 2015 +0100

----------------------------------------------------------------------
 build.xml | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c04a6bc/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index dd3bafa,81ab58f..c40adfd
--- a/build.xml
+++ b/build.xml
@@@ -1131,11 -1177,11 +1136,11 @@@
      <attribute name="filelist" default="" />
      <attribute name="poffset" default="0"/>
      <attribute name="testtag" default=""/>
 -    
      <attribute name="usejacoco" default="no"/>
 +
      <sequential>
        <condition property="additionalagent"
-                  value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.execfile}"
+                  value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.partialexecfile}"
                   else="">
          <istrue value="${usejacoco}"/>
        </condition>


Mime
View raw message