You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/04/21 09:47:40 UTC
[1/4] git commit: Fix changelog
Repository: cassandra
Updated Branches:
refs/heads/trunk 894d6f67a -> e5ace5b42
Fix changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0b41d00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0b41d00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0b41d00
Branch: refs/heads/trunk
Commit: d0b41d00922f8325de02808289ef52537be77595
Parents: 13d3a47
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Apr 21 09:43:38 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Apr 21 09:43:38 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0b41d00/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bf80e1e..b4498fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,7 @@
* Fix bootstrapping when there is no schema (CASSANDRA-6685)
* Fix truncating compression metadata (CASSANDRA-6791)
* Fix SSTable not released if stream session fails before starts (CASSANDRA-6818)
+ * Properly load trustore in the native protocol (CASSANDRA-6847)
1.2.15
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@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/e5ace5b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ace5b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5ace5b4
Branch: refs/heads/trunk
Commit: e5ace5b423af591cd828923e1096772c59273e35
Parents: 894d6f6 cde7809
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Apr 21 09:47:29 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Apr 21 09:47:29 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5ace5b4/CHANGES.txt
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4596a078
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4596a078
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4596a078
Branch: refs/heads/trunk
Commit: 4596a0781ba3ed5f0ea755a8a11c041f6614b735
Parents: 167af2b d0b41d0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Apr 21 09:46:04 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Apr 21 09:46:04 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4596a078/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0605f87,b4498fa..972f65a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -59,56 -13,10 +59,57 @@@ Merged from 1.2
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
* fix nodetool getsstables for blob PK (CASSANDRA-6803)
+ * Fix BatchlogManager#deleteBatch() use of millisecond timestamps
+ (CASSANDRA-6822)
+ * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+ * Schedule schema pulls on change (CASSANDRA-6971)
+ * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+ * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
++ * Properly load trustore in the native protocol (CASSANDRA-6847)
+
+
+2.0.6
+ * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
+ * Pool CqlRecordWriter clients by inetaddress rather than Range
+ (CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6683)
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+ * Add static columns to CQL3 (CASSANDRA-6561)
+ * Optimize single partition batch statements (CASSANDRA-6737)
+ * Disallow post-query re-ordering when paging (CASSANDRA-6722)
+ * Fix potential paging bug with deleted columns (CASSANDRA-6748)
+ * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636)
+ * Fix truncating compression metadata (CASSANDRA-6791)
+ * Fix UPDATE updating PRIMARY KEY columns implicitly (CASSANDRA-6782)
+ * Fix IllegalArgumentException when updating from 1.2 with SuperColumns
+ (CASSANDRA-6733)
+ * FBUtilities.singleton() should use the CF comparator (CASSANDRA-6778)
+ * Fix CQLSStableWriter.addRow(Map<String, Object>) (CASSANDRA-6526)
+ * Fix HSHA server introducing corrupt data (CASSANDRA-6285)
+ * Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813)
+Merged from 1.2:
* Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde78097
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cde78097
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cde78097
Branch: refs/heads/trunk
Commit: cde78097d16f85b0d45bc3b97904962353ef3198
Parents: 477a0a2 4596a07
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Apr 21 09:47:01 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Apr 21 09:47:01 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde78097/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca88dfd,972f65a..b0e8e0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -108,8 -65,7 +108,9 @@@ Merged from 1.2
* Schedule schema pulls on change (CASSANDRA-6971)
* Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
* Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+ * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
+ * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+ * Properly load trustore in the native protocol (CASSANDRA-6847)
2.0.6