You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2016/07/21 15:19:51 UTC

[1/4] cassandra git commit: update CHANGES

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ba068472b -> ad1dcefe8
  refs/heads/cassandra-2.2 c7a25972e -> bfa1acd31


update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad1dcefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad1dcefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad1dcefe

Branch: refs/heads/cassandra-2.1
Commit: ad1dcefe8ed06cf2a7e5411e3f8e72f0a318d0cb
Parents: ba06847
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 21 10:18:56 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 21 10:18:56 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad1dcefe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d29feea..c3afaca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.1.16
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349)
 
 


[4/4] cassandra git commit: update CHANGES

Posted by jb...@apache.org.
update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfa1acd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfa1acd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfa1acd3

Branch: refs/heads/cassandra-2.2
Commit: bfa1acd311c909ef88ee8133f9e9f9f2edc0749e
Parents: a5930af
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 21 10:19:47 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 21 10:19:47 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfa1acd3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ffd92b5..f35e0a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,8 +5,8 @@
  * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
  * Don't write shadowed range tombstone (CASSANDRA-12030)
+Merged from 2.1:
  * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Account for partition deletions in tombstone histogram (CASSANDRA-12112)


[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5930afa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5930afa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5930afa

Branch: refs/heads/cassandra-2.2
Commit: a5930afa35b56742cae9118054f96d7e0bec8cc3
Parents: c7a2597 ad1dcef
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 21 10:19:06 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 21 10:19:06 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/4] cassandra git commit: update CHANGES

Posted by jb...@apache.org.
update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad1dcefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad1dcefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad1dcefe

Branch: refs/heads/cassandra-2.2
Commit: ad1dcefe8ed06cf2a7e5411e3f8e72f0a318d0cb
Parents: ba06847
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 21 10:18:56 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 21 10:18:56 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad1dcefe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d29feea..c3afaca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.1.16
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349)