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.podkowin...@gmail.com> Authored: Tue Oct 25 12:01:54 2016 +0200 Committer: Benjamin Lerer <b.le...@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"/>
