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 8AE12D199 for ; Wed, 12 Dec 2012 21:12:55 +0000 (UTC) Received: (qmail 79676 invoked by uid 500); 12 Dec 2012 21:12:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79621 invoked by uid 500); 12 Dec 2012 21:12:55 -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 79608 invoked by uid 99); 12 Dec 2012 21:12:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Dec 2012 21:12:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 07B1681BA96; Wed, 12 Dec 2012 21:12:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121212211255.07B1681BA96@tyr.zones.apache.org> Date: Wed, 12 Dec 2012 21:12:55 +0000 (UTC) Merge branch 'cassandra-1.2.0' into cassandra-1.2 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/63743835 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63743835 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63743835 Branch: refs/heads/trunk Commit: 637438355c10db4c7a9ae56442a788b36e1bd59e Parents: db9eb04 f562f0b Author: Aleksey Yeschenko Authored: Thu Dec 13 00:11:01 2012 +0300 Committer: Aleksey Yeschenko Committed: Thu Dec 13 00:11:01 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ bin/cqlsh | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63743835/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2a70cec,d73849c..ba0177b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,7 +1,17 @@@ +1.2.1 + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + + 1.2.0 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + + 1.2-rc1 * rename rpc_timeout settings to request_timeout (CASSANDRA-5027) * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)