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 DE9AA10A6A for ; Tue, 16 Apr 2013 02:43:57 +0000 (UTC) Received: (qmail 14882 invoked by uid 500); 16 Apr 2013 02:43:57 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 14821 invoked by uid 500); 16 Apr 2013 02:43:57 -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 14803 invoked by uid 99); 16 Apr 2013 02:43:57 -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, 16 Apr 2013 02:43:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5221C1BFDD; Tue, 16 Apr 2013 02:43:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Tue, 16 Apr 2013 02:43:58 -0000 Message-Id: In-Reply-To: <21475e0b03894086ba016dd97b817fae@git.apache.org> References: <21475e0b03894086ba016dd97b817fae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk 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/cc7c549e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc7c549e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc7c549e Branch: refs/heads/trunk Commit: cc7c549e959897e5d25e46d31e1f91a795832ba7 Parents: 841ae04 40e7aba Author: Dave Brosius Authored: Mon Apr 15 22:42:19 2013 -0400 Committer: Dave Brosius Committed: Mon Apr 15 22:42:19 2013 -0400 ---------------------------------------------------------------------- .../concurrent/CreationTimeAwareFuture.java | 73 --------------- .../org/apache/cassandra/utils/FBUtilities.java | 27 ------ .../org/apache/cassandra/utils/obs/ArrayUtil.java | 39 -------- 3 files changed, 0 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc7c549e/src/java/org/apache/cassandra/utils/FBUtilities.java ----------------------------------------------------------------------