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 34EB3E54B for ; Tue, 12 Feb 2013 18:25:47 +0000 (UTC) Received: (qmail 70050 invoked by uid 500); 12 Feb 2013 18:25:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69999 invoked by uid 500); 12 Feb 2013 18:25:46 -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 69742 invoked by uid 99); 12 Feb 2013 18:25:46 -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, 12 Feb 2013 18:25:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6EFF151598; Tue, 12 Feb 2013 18:25:46 +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 X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130212182546.6EFF151598@tyr.zones.apache.org> Date: Tue, 12 Feb 2013 18:25:46 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 d0f7e9e14 -> aa7c7d9cd refs/heads/trunk f425c9251 -> 06d9bda83 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06d9bda8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06d9bda8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06d9bda8 Branch: refs/heads/trunk Commit: 06d9bda8322e4d4d267668f3bf8dded109e2b473 Parents: f425c92 aa7c7d9 Author: Jonathan Ellis Authored: Tue Feb 12 12:25:41 2013 -0600 Committer: Jonathan Ellis Committed: Tue Feb 12 12:25:41 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06d9bda8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a850c6b,0621c79..fe6d19e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -23,8 -15,8 +23,9 @@@ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) * CQL3 refactor to allow conversion function (CASSANDRA-5226) * Fix drop of sstables in some circumstance (CASSANDRA-5232) + * Add support for LZ4 compression (CASSANDRA-5038) * Implement caching of authorization results (CASSANDRA-4295) + * Add support for LZ4 compression (CASSANDRA-5038) 1.2.1