cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Fri, 07 Feb 2014 19:21:52 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 130d135a63b213844270e3f94e5b07658ac897dd
Parents: 7407cf9 c70f6d8
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Feb 7 13:19:38 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Feb 7 13:19:38 2014 -0600

----------------------------------------------------------------------
 build.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/130d135a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 6804a1b,eaf35b5..bfbd8b2
--- a/build.xml
+++ b/build.xml
@@@ -55,13 -56,13 +55,14 @@@
      <property name="test.conf" value="${test.dir}/conf"/>
      <property name="test.data" value="${test.dir}/data"/>
      <property name="test.name" value="*Test"/>
+     <property name="test.methods" value=""/>
      <property name="test.unit.src" value="${test.dir}/unit"/>
      <property name="test.long.src" value="${test.dir}/long"/>
 +    <property name="test.pig.src" value="${test.dir}/pig"/>
      <property name="dist.dir" value="${build.dir}/dist"/>
  	
 -	<property name="source.version" value="1.6"/>
 -	<property name="target.version" value="1.6"/>
 +	<property name="source.version" value="1.7"/>
 +	<property name="target.version" value="1.7"/>
  	
      <condition property="version" value="${base.version}">
        <isset property="release"/>


Mime
View raw message