You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/02 16:25:11 UTC
[1/7] git commit: Give users a clue how they called it.
Updated Branches:
refs/heads/trunk e2506f1d0 -> bcd80487a
Give users a clue how they called it.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f82021b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f82021b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f82021b1
Branch: refs/heads/trunk
Commit: f82021b1b977d8eb7f9ca794cf05c9c38fddd9a2
Parents: 1c86fa3
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 1 20:09:21 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 1 20:11:55 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/dht/RandomPartitioner.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f82021b1/src/java/org/apache/cassandra/dht/RandomPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
index 26b399e..f99bcc0 100644
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@ -161,7 +161,7 @@ public class RandomPartitioner extends AbstractPartitioner<BigIntegerToken>
Iterator i = sortedTokens.iterator();
// 0-case
- if (!i.hasNext()) { throw new RuntimeException("No nodes present in the cluster. How did you call this?"); }
+ if (!i.hasNext()) { throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?"); }
// 1-case
if (sortedTokens.size() == 1) {
ownerships.put((Token)i.next(), new Float(1.0));
[2/7] git commit: Give users a clue how they called it.
Posted by db...@apache.org.
Give users a clue how they called it.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dedeb0be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dedeb0be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dedeb0be
Branch: refs/heads/trunk
Commit: dedeb0be8a8173a045e976b9878ff72110242f00
Parents: f82021b
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 1 20:11:22 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 1 20:11:56 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dedeb0be/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
index a969320..502f5cc 100644
--- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
+++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
@@ -121,7 +121,7 @@ public class Murmur3Partitioner extends AbstractPartitioner<LongToken>
// 0-case
if (!i.hasNext())
- throw new RuntimeException("No nodes present in the cluster. How did you call this?");
+ throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?");
// 1-case
if (sortedTokens.size() == 1)
ownerships.put((Token) i.next(), new Float(1.0));
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcd80487
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd80487
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd80487
Branch: refs/heads/trunk
Commit: bcd80487a4c4af3b5e76a6720b5032ae2d622a22
Parents: e2506f1 2ef11b4
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:24:19 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:24:19 2013 -0400
----------------------------------------------------------------------
build.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd80487/build.xml
----------------------------------------------------------------------
[3/7] git commit: explicitly set java source and target to 1.6 for
the ant tasks patch by dbrosius reviewed by slebresne for CASSANDRA-5533
Posted by db...@apache.org.
explicitly set java source and target to 1.6 for the ant tasks
patch by dbrosius reviewed by slebresne for CASSANDRA-5533
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8567d15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8567d15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8567d15
Branch: refs/heads/trunk
Commit: f8567d15fee3bf4251e3324f1809edb29cd75645
Parents: 08eebcd
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:08:44 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:08:44 2013 -0400
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8567d15/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 57e3ab2..43172c9 100644
--- a/build.xml
+++ b/build.xml
@@ -60,6 +60,10 @@
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
+
+ <property name="source.version" value="1.6"/>
+ <property name="target.version" value="1.6"/>
+
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@@ -650,12 +654,12 @@
<echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! -->
<javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.thrift}" includeantruntime="false">
+ destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${interface.thrift.dir}/gen-java"/>
<classpath refid="cassandra.classpath"/>
</javac>
<javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.main}" includeantruntime="false">
+ destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
@@ -941,7 +945,9 @@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
<pathelement location="${build.classes.cql}"/>
[5/7] git commit: explicitly set java source and target to 1.6 for
the ant tasks
Posted by db...@apache.org.
explicitly set java source and target to 1.6 for the ant tasks
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b4f6a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b4f6a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b4f6a9
Branch: refs/heads/trunk
Commit: b4b4f6a95c1c80f34c287db675d5a23d705e11dc
Parents: d5754ab
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:18:03 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:18:03 2013 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b4f6a9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3d76d14..b77c417 100644
--- a/build.xml
+++ b/build.xml
@@ -708,7 +708,7 @@
</path>
<target name="stress-build" depends="build">
<mkdir dir="${stress.build.classes}" />
- <javac destdir="${stress.build.classes}" includeantruntime="true">
+ <javac destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
[6/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by db...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ef11b4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ef11b4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ef11b4b
Branch: refs/heads/trunk
Commit: 2ef11b4b6d67acf7cc66c1e256a750291f504484
Parents: dedeb0b b4b4f6a
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:23:08 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:23:08 2013 -0400
----------------------------------------------------------------------
build.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ef11b4b/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index c8407b2,b77c417..05a6c84
--- a/build.xml
+++ b/build.xml
@@@ -1017,7 -1015,8 +1021,9 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false">
++ includeantruntime="false"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>
[4/7] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Posted by db...@apache.org.
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5754ab2
Branch: refs/heads/trunk
Commit: d5754ab223116f26749d0df0c942d43c819ff63b
Parents: de212e5 f8567d1
Author: Dave Brosius <db...@apache.org>
Authored: Thu May 2 10:12:19 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu May 2 10:12:19 2013 -0400
----------------------------------------------------------------------
build.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5754ab2/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ab4dd71,43172c9..3d76d14
--- a/build.xml
+++ b/build.xml
@@@ -1010,9 -945,12 +1014,11 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ source="${source.version}"
+ target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
- <pathelement location="${build.classes.cql}"/>
</classpath>
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>