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 1663EE458 for ; Tue, 20 Nov 2012 18:21:24 +0000 (UTC) Received: (qmail 93618 invoked by uid 500); 20 Nov 2012 18:21:23 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 93526 invoked by uid 500); 20 Nov 2012 18:21:23 -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 93496 invoked by uid 99); 20 Nov 2012 18:21:23 -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, 20 Nov 2012 18:21:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 59B693183EE; Tue, 20 Nov 2012 18:21:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121120182123.59B693183EE@tyr.zones.apache.org> Date: Tue, 20 Nov 2012 18:21:23 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 efded0046 -> c235229e9 refs/heads/cassandra-1.2.0 edf63d8a5 -> 553b9e86d refs/heads/trunk 633dbbd7a -> 44b7b7a62 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/44b7b7a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44b7b7a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44b7b7a6 Branch: refs/heads/trunk Commit: 44b7b7a62bf54b084a2696bb7f6a9985fcde54cc Parents: 633dbbd c235229 Author: Yuki Morishita Authored: Tue Nov 20 12:20:20 2012 -0600 Committer: Yuki Morishita Committed: Tue Nov 20 12:20:20 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ----------------------------------------------------------------------