Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B7019107B1 for ; Tue, 30 Jul 2013 20:40:59 +0000 (UTC) Received: (qmail 79503 invoked by uid 500); 30 Jul 2013 20:40:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79464 invoked by uid 500); 30 Jul 2013 20:40:59 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 79374 invoked by uid 99); 30 Jul 2013 20:40:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 20:40:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 456EC830469; Tue, 30 Jul 2013 20:40:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 30 Jul 2013 20:41:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: merge from 1.2 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 Authored: Tue Jul 30 15:41:01 2013 -0500 Committer: Jonathan Ellis 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 ----------------------------------------------------------------------