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 <[email protected]> Authored: Tue Jan 26 05:38:17 2016 -0800 Committer: Jason Brown <[email protected]> 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 ----------------------------------------------------------------------
