You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/27 17:21:12 UTC
[1/4] git commit: Add ability to detect unofficial openjdk builds.
Repository: cassandra
Updated Branches:
refs/heads/trunk 2a6e0714a -> 0d0aed85f
Add ability to detect unofficial openjdk builds.
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e272c23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e272c23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e272c23
Branch: refs/heads/trunk
Commit: 0e272c233d050961fe79b94f333668b900d4fbbe
Parents: 29befa1
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 27 10:08:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 27 10:08:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e272c23/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c4c8bd5..3544426 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb62ef40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb62ef40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb62ef40
Branch: refs/heads/trunk
Commit: cb62ef401972d4674b5d810019bd3575b95f9e8d
Parents: ec09753 0e272c2
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 27 10:11:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 27 10:11:20 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb62ef40/conf/cassandra-env.sh
----------------------------------------------------------------------
[3/4] git commit: Ninja s/substract/subtract
Posted by al...@apache.org.
Ninja s/substract/subtract
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a9d8cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a9d8cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a9d8cc
Branch: refs/heads/trunk
Commit: 44a9d8cc689ffe9f3a5628a1e816730e75736bbf
Parents: cb62ef4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Aug 27 18:16:19 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Aug 27 18:16:36 2014 +0300
----------------------------------------------------------------------
pylib/cqlshlib/helptopics.py | 2 +-
src/java/org/apache/cassandra/cql3/Operation.java | 4 ++--
src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
test/unit/org/apache/cassandra/cql3/CollectionsTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/pylib/cqlshlib/helptopics.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/helptopics.py b/pylib/cqlshlib/helptopics.py
index 9848c71..34584ff 100644
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@ -388,7 +388,7 @@ class CQLHelpTopics(object):
Counter columns can be incremented or decremented by an arbitrary
numeric value though the assignment of an expression that adds or
- substracts the value.
+ subtracts the value.
"""
def help_update_where(self):
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/src/java/org/apache/cassandra/cql3/Operation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Operation.java b/src/java/org/apache/cassandra/cql3/Operation.java
index ace466c..ebcb30b 100644
--- a/src/java/org/apache/cassandra/cql3/Operation.java
+++ b/src/java/org/apache/cassandra/cql3/Operation.java
@@ -92,7 +92,7 @@ public abstract class Operation
* This can be one of:
* - Setting a value: c = v
* - Setting an element of a collection: c[x] = v
- * - An addition/substraction to a variable: c = c +/- v (where v can be a collection literal)
+ * - An addition/subtraction to a variable: c = c +/- v (where v can be a collection literal)
* - An prepend operation: c = v + c
*/
public interface RawUpdate
@@ -303,7 +303,7 @@ public abstract class Operation
case SET:
return new Sets.Discarder(receiver, value.prepare(keyspace, receiver));
case MAP:
- // The value for a map substraction is actually a set
+ // The value for a map subtraction is actually a set
ColumnSpecification vr = new ColumnSpecification(receiver.ksName,
receiver.cfName,
receiver.name,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/src/java/org/apache/cassandra/cql3/Sets.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Sets.java b/src/java/org/apache/cassandra/cql3/Sets.java
index 20d9ac5..315d7d3 100644
--- a/src/java/org/apache/cassandra/cql3/Sets.java
+++ b/src/java/org/apache/cassandra/cql3/Sets.java
@@ -282,7 +282,7 @@ public abstract class Sets
}
}
- // Note that this is reused for Map substraction too (we substract a set from a map)
+ // Note that this is reused for Map subtraction too (we subtract a set from a map)
public static class Discarder extends Operation
{
public Discarder(ColumnDefinition column, Term t)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/test/unit/org/apache/cassandra/cql3/CollectionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CollectionsTest.java b/test/unit/org/apache/cassandra/cql3/CollectionsTest.java
index 72a24f0..01e05f2 100644
--- a/test/unit/org/apache/cassandra/cql3/CollectionsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CollectionsTest.java
@@ -76,7 +76,7 @@ public class CollectionsTest extends CQLTester
assertInvalid("UPDATE %s SET m = m + ? WHERE k = 0", list("a", "b"));
assertInvalid("UPDATE %s SET m = m - [ 'a', 'b' ] WHERE k = 0");
assertInvalid("UPDATE %s SET m = m + ? WHERE k = 0", set("a", "b"));
- // Note that we do allow substracting a set from a map, but not a map from a map
+ // Note that we do allow subtracting a set from a map, but not a map from a map
// TODO: We should remove this 'if' once #7833 is resolved
if (!usePrepared())
assertInvalid("UPDATE %s SET m = m - ? WHERE k = 0", map("a", "b", "c", "d"));
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
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/0d0aed85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d0aed85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d0aed85
Branch: refs/heads/trunk
Commit: 0d0aed85fe1b520f9390091b74e4e4d4a70b7425
Parents: 2a6e071 44a9d8c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Aug 27 18:21:02 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Aug 27 18:21:02 2014 +0300
----------------------------------------------------------------------
pylib/cqlshlib/helptopics.py | 2 +-
src/java/org/apache/cassandra/cql3/Operation.java | 4 ++--
src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
test/unit/org/apache/cassandra/cql3/CollectionsTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/pylib/cqlshlib/helptopics.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/src/java/org/apache/cassandra/cql3/Sets.java
----------------------------------------------------------------------