Return-Path: <commits-return-184475-archive-asf-public=cust-asf.ponee.io@cassandra.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id E0CB8200BAD
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 25 Oct 2016 12:14:19 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id DAA8A160B02; Tue, 25 Oct 2016 10:14:19 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 2CBDA160AE6
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 25 Oct 2016 12:14:19 +0200 (CEST)
Received: (qmail 68850 invoked by uid 500); 25 Oct 2016 10:14:18 -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 68826 invoked by uid 99); 25 Oct 2016 10:14:18 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2016 10:14:18 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 39F07DFE80; Tue, 25 Oct 2016 10:14:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: blerer@apache.org
To: commits@cassandra.apache.org
Date: Tue, 25 Oct 2016 10:14:18 -0000
Message-Id: <f0ea9bd46b634533a601cfff74d0790c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] cassandra git commit: Use different build directories for
 Eclipse and Ant
archived-at: Tue, 25 Oct 2016 10:14:20 -0000

Repository: cassandra
Updated Branches:
  refs/heads/trunk 9d4fd903f -> 4c728d2e4


Use different build directories for Eclipse and Ant

patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466


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

Branch: refs/heads/trunk
Commit: 6497d3727f932d0b9e95f0ecf2440935f82f4530
Parents: 13b7362
Author: Stefan Podkowinski <s.podkowinski@gmail.com>
Authored: Tue Oct 25 12:01:54 2016 +0200
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Tue Oct 25 12:01:54 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6497d372/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ef728c7..85ef114 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.10
+ * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
  * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
  * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
  * Upgrade commons-codec to 1.9 (CASSANDRA-12790)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6497d372/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 40126b0..c178197 100644
--- a/build.xml
+++ b/build.xml
@@ -1788,7 +1788,7 @@
   <classpathentry kind="src" path="tools/stress/src"/>
   <classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" />
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="output" path="build/classes/main"/>
+  <classpathentry kind="output" path="build/classes/eclipse"/>
   <classpathentry kind="lib" path="build/classes/thrift" sourcepath="interface/thrift/gen-java/"/>
   <classpathentry kind="lib" path="test/conf"/>
   <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>