cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [18/19] git commit: merge from 2.1.0
Date Wed, 06 Aug 2014 18:30:19 GMT
merge from 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/54d2e8e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54d2e8e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54d2e8e2

Branch: refs/heads/trunk
Commit: 54d2e8e2deb83cceffa909688c14d42a71a083b3
Parents: 821a2fe d9b7d44
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Aug 6 13:28:59 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Aug 6 13:28:59 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     | 55 ++------------------
 .../cassandra/config/DatabaseDescriptor.java    |  2 +-
 .../cassandra/db/filter/SliceQueryFilter.java   |  4 +-
 3 files changed, 8 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d2e8e2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4bf17a2,78abb47..284d55e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,9 -3,17 +24,13 @@@ Merged from 2.0
   * 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)
 - * 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)
  Merged from 2.0:
-  * Update java driver (for hadoop) (CASSANDRA-7618)
+  * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+  * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
   * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
+  * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+  * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+  * Update java driver (for hadoop) (CASSANDRA-7618)
   * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d2e8e2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d2e8e2/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------


Mime
View raw message