You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/04 20:22:15 UTC
[1/2] git commit: Fix CHANGES.txt
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 7f6632f7f -> 5f4cd8a5d
Fix CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21db1a05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21db1a05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21db1a05
Branch: refs/heads/cassandra-2.1.0
Commit: 21db1a057bc71505735ed450f6a9852f99908b56
Parents: 23402f4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 4 21:19:12 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 4 21:19:12 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21db1a05/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f3654f7..3471bcc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,12 +61,6 @@ Merged from 1.2:
are broken (CASSANDRA-7059)
Merged from 1.2:
* Expose global ColumnFamily metrics (CASSANDRA-7273)
-||||||| merged common ancestors
-1.2.17
-=======
-
-1.2.17
->>>>>>> cassandra-1.2
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
* Expose global ColumnFamily metrics (CASSANDRA-7273)
* Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f4cd8a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f4cd8a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f4cd8a5
Branch: refs/heads/cassandra-2.1.0
Commit: 5f4cd8a5d4d17675ac6d720928faa8f7c0740a8a
Parents: 7f6632f 21db1a0
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 4 21:21:05 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 4 21:21:48 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 55 -------------------------------------------------------
1 file changed, 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cd8a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5033722,3471bcc..b87dc0b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -112,101 -24,26 +112,46 @@@ Merged from 2.0
* Backport CASSANDRA-6747 (CASSANDRA-7560)
* Track max/min timestamps for range tombstones (CASSANDRA-7647)
* Fix NPE when listing saved caches dir (CASSANDRA-7632)
-Merged from 1.2:
- * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
- * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
- * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
- * Set correct stream ID on responses when non-Exception Throwables
- are thrown while handling native protocol messages (CASSANDRA-7470)
--2.0.9
-- * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
-- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
-- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
-- * Fix native protocol CAS batches (CASSANDRA-7337)
- * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
- * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
- * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
- * Don't fail streams on failure detector downs (CASSANDRA-3569)
- * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
- * Reduce run time for CQL tests (CASSANDRA-7327)
- * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
- * RefCount native frames from netty (CASSANDRA-7245)
- * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
- * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
- * Fix schema change response in native protocol v3 (CASSANDRA-7413)
- Merged from 2.0:
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
-- * Add per-CF range read request latency metrics (CASSANDRA-7338)
-- * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
- * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
- * Fix infinite loop on exception while streaming (CASSANDRA-7330)
- * Account for range tombstones in min/max column names (CASSANDRA-7235)
- * Improve sub range repair validation (CASSANDRA-7317)
- * Accept subtypes for function results, type casts (CASSANDRA-6766)
- * Support DISTINCT for static columns and fix behaviour when DISTINC is
- not use (CASSANDRA-7305).
- * Refuse range queries with strict bounds on compact tables since they
- are broken (CASSANDRA-7059)
- Merged from 1.2:
- * Expose global ColumnFamily metrics (CASSANDRA-7273)
- ||||||| merged common ancestors
- 1.2.17
- =======
-
- 1.2.17
- >>>>>>> cassandra-1.2
- * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
- * Expose global ColumnFamily metrics (CASSANDRA-7273)
- * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
- * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
- * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
- * reduce failure detector initial value to 2s (CASSANDRA-7307)
- * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
- * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
- * Track metrics at a keyspace level (CASSANDRA-6539)
- * Add replace_address_first_boot flag to only replace if not bootstrapped
- (CASSANDRA-7356)
- * Enable keepalive for native protocol (CASSANDRA-7380)
- * Check internal addresses for seeds (CASSANDRA-6523)
- * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)
- * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
- * Fix RangeTombstone copy bug (CASSANDRA-7371)
-
-
- * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
- * Swap local and global default read repair chances (CASSANDRA-7320)
- * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+2.1.0-rc1
+ * Revert flush directory (CASSANDRA-6357)
+ * More efficient executor service for fast operations (CASSANDRA-4718)
+ * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
+ * Support more concurrent requests in native protocol (CASSANDRA-7231)
+ * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
+ * Change concurrent_compactors defaults (CASSANDRA-7139)
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+ * remove unused classes (CASSANDRA-7197)
+ * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
+ * Add validate method to CollectionType (CASSANDRA-7208)
+ * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
+ * Fix nodetool netstats (CASSANDRA-7270)
+ * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
+ * Use prepared statements internally (CASSANDRA-6975)
+ * Fix broken paging state with prepared statement (CASSANDRA-7120)
+ * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
+ * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
+ * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
+ * Handle overlapping MultiSlices (CASSANDRA-7279)
+ * Fix DataOutputTest on Windows (CASSANDRA-7265)
+ * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)
+ * Add tuple type to CQL/native protocol (CASSANDRA-7248)
+ * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322)
+Merged from 2.0:
* Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
* Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
* Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)