cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/2] git commit: merge from 1.2
Date Tue, 30 Jul 2013 20:41:00 GMT
merge from 1.2


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

Branch: refs/heads/trunk
Commit: cb981e6242c7397619797dda5dea4db6396f47a9
Parents: ef29c82 2ccbe3c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 30 15:41:01 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 30 15:41:01 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb981e62/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a9cb47c,c20c0fe..30b70a7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,6 -3,10 +11,7 @@@ Merged from 1.2
   * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
     (CASSANDRA-5824)
   * update default LCS sstable size to 160MB (CASSANDRA-5727)
+  * Hex-encode non-String keys in OPP (CASSANDRA-5793)
 -
 -
 -1.2.8
   * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
   * cqlsh: add collections support to COPY (CASSANDRA-5698)
   * retry important messages for any IOException (CASSANDRA-5804)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb981e62/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
----------------------------------------------------------------------


Mime
View raw message