cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Wed, 06 Aug 2014 18:10:49 GMT
Merge branch 'cassandra-2.1.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/fa388ecb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa388ecb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa388ecb

Branch: refs/heads/cassandra-2.1
Commit: fa388ecbc3eddf8103ddac6e4f73a41abbc1a7a8
Parents: 304260d 1993702
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 6 13:10:27 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Aug 6 13:10:27 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa388ecb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eb3485a,e15a749..4bf17a2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,10 -3,14 +24,9 @@@ 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)
 - * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
  Merged from 2.0:
-  * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
-  * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
   * Update java driver (for hadoop) (CASSANDRA-7618)
+  * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
   * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
  
  


Mime
View raw message