[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-20 Thread yukim
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java


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

Branch: refs/heads/cassandra-2.1
Commit: 45159ae7b3a1b1c67050ff03fd72a71c61f04a91
Parents: c8a8bfc 4fc417c
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 20 10:03:59 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 20 10:03:59 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/StreamReceiveTask.java  | 57 
 2 files changed, 35 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/45159ae7/CHANGES.txt
--
diff --cc CHANGES.txt
index 873eb78,fe9f4e0..ebd74b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,22 +1,40 @@@
 -2.0.10
 - * Stop inheriting liveRatio and liveRatioComputedAt from previous
 -   memtables (CASSANDRA-7796)
 +2.1.0
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
   * Throw EOFException if we run out of chunks in compressed datafile
 (CASSANDRA-7664)
 - * Throw InvalidRequestException when queries contain relations on entire
 -   collection columns (CASSANDRA-7506)
   * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
   * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
 - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
++ * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795)
 +Merged from 1.2:
 + * Validate empty cell names from counter updates (CASSANDRA-7798)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-20 Thread jbellis
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/da457867
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da457867
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da457867

Branch: refs/heads/cassandra-2.1
Commit: da45786788b58f272edf1e4f091c43b640f4a338
Parents: d345057 44cfd95
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 20 10:00:47 2014 -0700
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 20 10:01:09 2014 -0700

--
 CHANGES.txt  | 4 ++--
 src/java/org/apache/cassandra/config/CFMetaData.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da457867/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fac3b1,17c0671..2664f0f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,25 +1,42 @@@
 -2.0.10
 +2.1.0
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
- 2.0.10
++Merged from 2.0:
+  * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
   * Fix ALTER clustering column type from DateType to TimestampType when
 using DESC clustering order (CASSANRDA-7797)
 - * Stop inheriting liveRatio and liveRatioComputedAt from previous
 -   memtables (CASSANDRA-7796)
   * Throw EOFException if we run out of chunks in compressed datafile
 (CASSANDRA-7664)
 - * Throw InvalidRequestException when queries contain relations on entire
 -   collection columns (CASSANDRA-7506)
   * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
   * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
 - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795)
- Merged from 1.2:
 + * Validate empty cell names from counter updates (CASSANDRA-7798)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/da457867/src/java/org/apache/cassandra/config/CFMetaData.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-18 Thread yukim
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/055b8964
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/055b8964
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/055b8964

Branch: refs/heads/cassandra-2.1
Commit: 055b89642f142b089394f219e60b34cb473a6b70
Parents: 56db001 384d4f0
Author: Yuki Morishita yu...@apache.org
Authored: Mon Aug 18 13:27:06 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Aug 18 13:27:06 2014 -0500

--

--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread brandonwilliams
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/dbc45825
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc45825
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbc45825

Branch: refs/heads/cassandra-2.1
Commit: dbc458256f9b6c1bce4b84476e1e7d4a2cec77e5
Parents: fbe7b90 7049ee0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 12:34:46 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 12:34:46 2014 -0500

--
 .../cassandra/hadoop/cql3/CqlRecordReader.java  | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbc45825/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread brandonwilliams
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/51728606
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51728606
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51728606

Branch: refs/heads/cassandra-2.1
Commit: 5172860618fd42b298a7a6d3c35b2e8edb7a7c03
Parents: 6795b6e 7ddcf3e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 13:33:32 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 13:33:32 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51728606/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread brandonwilliams
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/fcd2fc03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd2fc03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd2fc03

Branch: refs/heads/cassandra-2.1
Commit: fcd2fc0387c64697995071ab40f6a9d0f2b9056f
Parents: dc8b4e1 67889d6
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 20:10:29 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 20:10:29 2014 -0500

--
 .../cassandra/pig/CqlRecordReaderTest.java  | 132 +++
 1 file changed, 132 insertions(+)
--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread brandonwilliams
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/397c0b7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/397c0b7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/397c0b7c

Branch: refs/heads/cassandra-2.1
Commit: 397c0b7c099cc1790c865d9dac7bd46b6194eddf
Parents: fcd2fc0 6e73a51
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 20:51:32 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 20:51:32 2014 -0500

--
 .../cassandra/hadoop/cql3/CqlRecordReader.java  |  2 +-
 .../cassandra/pig/CqlRecordReaderTest.java  | 33 +++-
 2 files changed, 33 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/397c0b7c/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-31 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
bin/cassandra-shuffle.bat


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

Branch: refs/heads/cassandra-2.1
Commit: 8e4415b697acc2fc25c52cc3031b0b973fe9fd15
Parents: 0947fb8 563a04b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 31 15:13:37 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 31 15:13:37 2014 -0500

--
 bin/cassandra-shuffle.bat | 37 -
 1 file changed, 37 deletions(-)
--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-30 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/cassandra-2.1
Commit: 08fd11dc1dd37079fcc265c5a5a048910f699f76
Parents: 948ae01 b40cb05
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jul 30 16:54:49 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jul 30 16:54:49 2014 -0500

--
 .../cassandra/service/StorageService.java   | 45 +---
 1 file changed, 2 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08fd11dc/src/java/org/apache/cassandra/service/StorageService.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-25 Thread brandonwilliams
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/821d7a72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/821d7a72
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/821d7a72

Branch: refs/heads/cassandra-2.1
Commit: 821d7a72de4cbf9805210b3582d428cb9863f0dc
Parents: e2219eb d9cc6c1
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 10:47:07 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 10:47:07 2014 -0500

--
 .../cassandra/db/RecoveryManagerTest.java   | 36 
 1 file changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/821d7a72/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
--



[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-25 Thread brandonwilliams
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/66577d6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66577d6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66577d6c

Branch: refs/heads/cassandra-2.1
Commit: 66577d6c22666580dc8cbf9f5567cc5afc832447
Parents: 821d7a7 60e56d4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 10:58:46 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 10:58:46 2014 -0500

--

--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-25 Thread brandonwilliams
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/5544ecbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5544ecbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5544ecbf

Branch: refs/heads/cassandra-2.1
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 13:11:08 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-22 Thread yukim
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/3c055631
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c055631
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c055631

Branch: refs/heads/cassandra-2.1
Commit: 3c0556316b878e4ad69eee0587d99ca5e0b37495
Parents: e740c29 ef894c2
Author: Yuki Morishita yu...@apache.org
Authored: Tue Jul 22 16:16:56 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Jul 22 16:16:56 2014 -0500

--

--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-17 Thread brandonwilliams
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/5de9c17d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de9c17d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5de9c17d

Branch: refs/heads/cassandra-2.1
Commit: 5de9c17dd57dbf2877a9878b0dd13d32868ce629
Parents: 9c1782d 062addb
Author: Brandon Williams bran...@datastax.com
Authored: Thu Jul 17 15:49:12 2014 -0500
Committer: Brandon Williams bran...@datastax.com
Committed: Thu Jul 17 15:49:12 2014 -0500

--

--




[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-10 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1.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/1a9d4b89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a9d4b89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a9d4b89

Branch: refs/heads/cassandra-2.1
Commit: 1a9d4b89d5331d8677dd9d59795d39c3a4138610
Parents: 420c685 11351e3
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 10 12:10:32 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 10 12:10:32 2014 -0500

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/security/SSLFactory.java| 19 +++
 2 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a9d4b89/CHANGES.txt
--
diff --cc CHANGES.txt
index e459638,6b4e44b..5132976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 -2.0.10
 +2.1.0-final
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 +Merged from 2.0:
+  * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 +
 +
 +2.1.0-rc3
 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
 + * Introduce CQL support for stress tool (CASSANDRA-6146)
 + * Fix ClassCastException processing expired messages (CASSANDRA-7496)
 + * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
 + * Remove left-over populate_io_cache_on_flush and replicate_on_write
 +   uses (CASSANDRA-7493)
 + * (Windows) handle spaces in path names (CASSANDRA-7451)
 + * Ensure writes have completed after dropping a table, before recycling
 +   commit log segments (CASSANDRA-7437)
 + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
 + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502)
 + * Properly reject unknown UDT field (CASSANDRA-7484)
 +Merged from 2.0:
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
   * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
   * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
   * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM