Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/851fe640 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/851fe640 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/851fe640 Branch: refs/heads/trunk Commit: 851fe64006f7d0493a9079d7520c70a1096c02b1 Parents: 011e8a0 4f5c847 Author: Dave Brosius <dbros...@apache.org> Authored: Tue Apr 30 01:01:55 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Tue Apr 30 01:01:55 2013 -0400 ---------------------------------------------------------------------- build.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/851fe640/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 8889794,c8407b2..ec2e90a --- a/build.xml +++ b/build.xml @@@ -122,12 -123,9 +123,13 @@@ </fileset> <fileset dir="${build.dir.lib}"> <include name="**/*.jar" /> + <exclude name="**/*-sources.jar"/> </fileset> </path> + + <path id="cobertura.classpath"> + <pathelement location="${cobertura.classes.dir}"/> + </path> <macrodef name="create-javadoc"> <attribute name="destdir"/>
