Return-Path: 
 <commits-return-99586-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 953BE115DC
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Tue, 13 May 2014 16:11:08 +0000 (UTC)
Received: (qmail 95296 invoked by uid 500); 13 May 2014 12:07:07 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 95158 invoked by uid 500); 13 May 2014 12:07:07 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 95027 invoked by uid 99); 13 May 2014 12:07:07 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 May 2014 12:07:07 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0972A24B55; Tue, 13 May 2014 12:07:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: slebresne@apache.org
To: commits@cassandra.apache.org
Date: Tue, 13 May 2014 12:07:09 -0000
Message-Id: <c298aef2568d49e1b137f48b0070c607@git.apache.org>
In-Reply-To: <11be860ea8af41418221c929c05a4b0c@git.apache.org>
References: <11be860ea8af41418221c929c05a4b0c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/5] git commit: Merge branch 'cassandra-2.1' into trunk

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/3b949c2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b949c2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b949c2d

Branch: refs/heads/trunk
Commit: 3b949c2d1c12db917e7da1604782c798c114e633
Parents: 6f36ebb 09feef3
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue May 13 14:06:25 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue May 13 14:06:25 2014 +0200

----------------------------------------------------------------------
 build.xml                                                    | 1 +
 src/java/org/apache/cassandra/transport/FrameCompressor.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b949c2d/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 19e18b4,fa3b5ca..98da4d9
--- a/build.xml
+++ b/build.xml
@@@ -678,8 -692,8 +678,9 @@@
                 destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
              <src path="${build.src.java}"/>
              <src path="${build.src.gen-java}"/>
 +        	<compilerarg value="-XDignore.symbol.file"/>
              <classpath refid="cassandra.classpath"/>
+             <compilerarg value="-XDignore.symbol.file"/>
          </javac>
          <antcall target="createVersionPropFile"/>
          <copy todir="${build.classes.main}">