You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/02/06 18:01:25 UTC
[1/4] git commit: Merge remote-tracking branch 'origin/cassandra-2.0'
into cassandra-2.0
Updated Branches:
refs/heads/trunk b4cd7b58e -> 300b02633
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/862698cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/862698cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/862698cd
Branch: refs/heads/trunk
Commit: 862698cd546ebc3adc99b5c84cfaf0764d3e3e96
Parents: 0b6913e 45955e6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 6 10:19:43 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Feb 6 10:19:43 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/862698cd/CHANGES.txt
----------------------------------------------------------------------
[2/4] git commit: Update CHANGES for CASSANDRA-6522
Posted by ma...@apache.org.
Update CHANGES for CASSANDRA-6522
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/933df01d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/933df01d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/933df01d
Branch: refs/heads/trunk
Commit: 933df01d2b64ecf3698e171017e37d67546acfb7
Parents: 862698c
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 6 17:58:36 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Feb 6 17:58:36 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/933df01d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58d3f90..8148083 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@
Merged from 1.2:
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
-
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
2.0.5
* Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
[4/4] git commit: Update CHANGES after CASSANDRA-5357
Posted by ma...@apache.org.
Update CHANGES after CASSANDRA-5357
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/300b0263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/300b0263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/300b0263
Branch: refs/heads/trunk
Commit: 300b02633e79f8e786a8a1f3ee1425d726c74663
Parents: 0b56fc0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 6 18:00:30 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Feb 6 18:00:30 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/300b0263/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1edbe0a..9d752ee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,7 +26,7 @@
uniquely for CF id (CASSANDRA-5202)
* New counters implementation (CASSANDRA-6504)
* Replace UnsortedColumns usage with ArrayBackedSortedColumns (CASSANDRA-6630)
-
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
2.0.6
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
[3/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b56fc09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b56fc09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b56fc09
Branch: refs/heads/trunk
Commit: 0b56fc0987d250f02c6d03e27c1ae68e8e1a27a9
Parents: b4cd7b5 933df01
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Feb 6 17:58:55 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Feb 6 17:58:55 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b56fc09/CHANGES.txt
----------------------------------------------------------------------