cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/3] git commit: Avoid build failure due to ANTLR timeout
Date Tue, 08 Apr 2014 17:26:56 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk c18ce589e -> 9e2eca3da


Avoid build failure due to ANTLR timeout

Patch by Ben Chan; reviewed by Tyler Hobbs for CASSANDRA-6991


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

Branch: refs/heads/trunk
Commit: 84daab53eaa20f30cdf77c174dcc432525771221
Parents: 2dd0907
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Apr 8 12:25:21 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Apr 8 12:25:21 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84daab53/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 38a6c3c..430e02c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -47,6 +47,7 @@
  * Avoid costly range calculations for range queries on system keyspaces
    (CASSANDRA-6906)
  * Fix SSTable not released if stream session fails (CASSANDRA-6818)
+ * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 Merged from 1.2:
  * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
  * add extra SSL cipher suites (CASSANDRA-6613)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84daab53/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a15415b..e6d77d8 100644
--- a/build.xml
+++ b/build.xml
@@ -229,6 +229,8 @@
             classpath="${build.lib}/antlr-3.2.jar"
             fork="true"
             failonerror="true">
+         <arg value="-Xconversiontimeout" />
+         <arg value="10000" />
          <arg value="${build.src.java}/org/apache/cassandra/cql3/Cql.g" />
          <arg value="-fo" />
          <arg value="${build.src.gen-java}/org/apache/cassandra/cql3/" />


Mime
View raw message