Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8c0199c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8c0199c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8c0199c Branch: refs/heads/trunk Commit: b8c0199c33567184043afeff83924a313e69d22f Parents: a44ba68 8e897de Author: Jonathan Ellis <[email protected]> Authored: Fri May 2 22:49:44 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri May 2 22:49:44 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +- build.xml | 2 + .../service/BatchlogEndpointSelector.java | 110 ++++++++++++++++++ .../apache/cassandra/service/StorageProxy.java | 21 +--- .../service/BatchlogEndpointSelectorTest.java | 116 +++++++++++++++++++ 5 files changed, 236 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c0199c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c0199c/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 1f67aa3,898b141..8b47e4e --- a/build.xml +++ b/build.xml @@@ -190,9 -190,10 +190,10 @@@ <target name="gen-cli-grammar" depends="check-gen-cli-grammar" unless="cliUpToDate"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cli/Cli.g ....</echo> <java classname="org.antlr.Tool" - classpath="${build.lib}/antlr-3.2.jar" + classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar" fork="true" failonerror="true"> + <jvmarg value="-Xmx512M" /> <arg value="${build.src.java}/org/apache/cassandra/cli/Cli.g" /> <arg value="-fo" /> <arg value="${build.src.gen-java}/org/apache/cassandra/cli/" /> @@@ -211,9 -217,21 +212,10 @@@ <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ...</echo> <java classname="org.antlr.Tool" - classpath="${build.lib}/antlr-3.2.jar" + classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar" fork="true" failonerror="true"> + <jvmarg value="-Xmx512M" /> <arg value="-Xconversiontimeout" /> <arg value="10000" /> <arg value="${build.src.java}/org/apache/cassandra/cql3/Cql.g" />
