natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Dave Brosius 2014-03-14 00:47:29 -04:00
parent 7aaa390b94 729da03c53
commit 8955a4658e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.xml
View File

@ -731,8 +731,8 @@
<jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}.jar"
basedir="${build.classes.thrift}">
<fileset dir="${build.classes.main}">
<include name="org/apache/cassandra/thrift/ITransportFactory.class" />
<include name="org/apache/cassandra/thrift/TFramedTransportFactory.class" />
<include name="org/apache/cassandra/thrift/ITransportFactory*.class" />
<include name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" />
</fileset>
<manifest>
<attribute name="Implementation-Title" value="Cassandra"/>
@ -742,8 +742,11 @@
</jar>
<!-- Main Jar -->
<jar jarfile="${build.dir}/${final.name}.jar"
basedir="${build.classes.main}">
<jar jarfile="${build.dir}/${final.name}.jar">
<fileset dir="${build.classes.main}">
<exclude name="org/apache/cassandra/thrift/ITransportFactory*.class" />
<exclude name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" />
</fileset>
<manifest>
<!-- <section name="org/apache/cassandra/infrastructure"> -->
<attribute name="Implementation-Title" value="Cassandra"/>