You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/01/26 14:38:34 UTC
[1/2] cassandra git commit: Added support for IBM zSystems
architecture (s390x)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.3 c146983e4 -> 61c93e78f
Added support for IBM zSystems architecture (s390x)
patch by Meerabo Shah; reviewed by jasobrown for CASSANDRA-11054
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ac43351
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ac43351
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ac43351
Branch: refs/heads/cassandra-3.3
Commit: 4ac433517ad6d6aab5b6e2aadec56cc82437a479
Parents: f3668e1
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Jan 26 05:35:56 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Jan 26 05:35:56 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/util/Memory.java | 2 +-
src/java/org/apache/cassandra/utils/FastByteOperations.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ac43351/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 70abffe..57e985d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Added support for IBM zSystems architecture (CASSANDRA-11054)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ac43351/src/java/org/apache/cassandra/io/util/Memory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java
index 07d3ca3..78950ce 100644
--- a/src/java/org/apache/cassandra/io/util/Memory.java
+++ b/src/java/org/apache/cassandra/io/util/Memory.java
@@ -59,7 +59,7 @@ public class Memory implements AutoCloseable
{
String arch = System.getProperty("os.arch");
unaligned = arch.equals("i386") || arch.equals("x86")
- || arch.equals("amd64") || arch.equals("x86_64");
+ || arch.equals("amd64") || arch.equals("x86_64") || arch.equals("s390x");
}
protected long peer;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ac43351/src/java/org/apache/cassandra/utils/FastByteOperations.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FastByteOperations.java b/src/java/org/apache/cassandra/utils/FastByteOperations.java
index f35d2e2..68e395c 100644
--- a/src/java/org/apache/cassandra/utils/FastByteOperations.java
+++ b/src/java/org/apache/cassandra/utils/FastByteOperations.java
@@ -104,7 +104,7 @@ public class FastByteOperations
{
String arch = System.getProperty("os.arch");
boolean unaligned = arch.equals("i386") || arch.equals("x86")
- || arch.equals("amd64") || arch.equals("x86_64");
+ || arch.equals("amd64") || arch.equals("x86_64") || arch.equals("s390x");
if (!unaligned)
return new PureJavaOperations();
try
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61c93e78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61c93e78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61c93e78
Branch: refs/heads/cassandra-3.3
Commit: 61c93e78fd6ec0413505ccbcc80b53cbbef68f45
Parents: c146983 4ac4335
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Jan 26 05:38:17 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Jan 26 05:38:17 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/util/Memory.java | 2 +-
src/java/org/apache/cassandra/utils/FastByteOperations.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c93e78/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 81657f9,57e985d..bac9a03
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Added support for IBM zSystems architecture (CASSANDRA-11054)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c93e78/src/java/org/apache/cassandra/utils/FastByteOperations.java
----------------------------------------------------------------------