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 5F27EC03C for ; Tue, 10 Jul 2012 17:19:34 +0000 (UTC) Received: (qmail 97197 invoked by uid 500); 10 Jul 2012 17:19:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 97154 invoked by uid 500); 10 Jul 2012 17:19:34 -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 97142 invoked by uid 99); 10 Jul 2012 17:19:34 -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, 10 Jul 2012 17:19:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EA6E7D68F; Tue, 10 Jul 2012 17:19:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xedin@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: merge from 1.1 Message-Id: <20120710171933.EA6E7D68F@tyr.zones.apache.org> Date: Tue, 10 Jul 2012 17:19:33 +0000 (UTC) Updated Branches: refs/heads/trunk 3c90be1d6 -> 720e01752 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/720e0175 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/720e0175 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/720e0175 Branch: refs/heads/trunk Commit: 720e017520f197e876a2b850e10340d9ef2cf748 Parents: 3c90be1 a6c567e Author: Pavel Yaskevich Authored: Tue Jul 10 20:17:29 2012 +0300 Committer: Pavel Yaskevich Committed: Tue Jul 10 20:17:29 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/MigrationManager.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/720e0175/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/720e0175/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------