cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.0' into trunk
Date Sun, 02 Feb 2014 07:37:53 GMT
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java


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

Branch: refs/heads/trunk
Commit: aa29b6af6af4923d80b68ab19efc05beeef7c45b
Parents: 02fb218 b713721
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sun Feb 2 02:37:14 2014 -0500
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Feb 2 02:37:14 2014 -0500

----------------------------------------------------------------------
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa29b6af/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 032cc71,6804a1b..0583012
--- a/build.xml
+++ b/build.xml
@@@ -1108,8 -1075,8 +1109,8 @@@
      </junit>
    </target>
  
 -  <target name="test" depends="build-test" description="Execute unit tests" >
 +  <target name="test" depends="build-test" description="Execute unit tests">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+     <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
        <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
        <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>


Mime
View raw message