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 BD71999EC for ; Tue, 14 Feb 2012 13:41:20 +0000 (UTC) Received: (qmail 92637 invoked by uid 500); 14 Feb 2012 13:41:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 92609 invoked by uid 500); 14 Feb 2012 13:41:20 -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 92598 invoked by uid 99); 14 Feb 2012 13:41:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 13:41:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 13:41:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6BF5C31FD01; Tue, 14 Feb 2012 13:40:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120214134059.6BF5C31FD01@tyr.zones.apache.org> Date: Tue, 14 Feb 2012 13:40:59 +0000 (UTC) Updated Branches: refs/heads/trunk 2170f1e80 -> 887c7f9c2 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/887c7f9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887c7f9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/887c7f9c Branch: refs/heads/trunk Commit: 887c7f9c25c8ac4830b12454af95e78745670195 Parents: 2170f1e d2c22a8 Author: Brandon Williams Authored: Tue Feb 14 07:31:24 2012 -0600 Committer: Brandon Williams Committed: Tue Feb 14 07:31:24 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 11 +++ .../cassandra/config/DatabaseDescriptor.java | 68 +++++++-------- .../apache/cassandra/hadoop/BulkRecordWriter.java | 10 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 ++- .../apache/cassandra/io/sstable/SSTableLoader.java | 8 ++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 5 +- .../cassandra/io/sstable/SSTableSimpleWriter.java | 9 ++- .../apache/cassandra/service/StorageService.java | 31 +++---- .../io/sstable/SSTableSimpleWriterTest.java | 5 +- 9 files changed, 92 insertions(+), 65 deletions(-) ----------------------------------------------------------------------