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 06C1110AEF for ; Wed, 14 Aug 2013 17:59:52 +0000 (UTC) Received: (qmail 9332 invoked by uid 500); 14 Aug 2013 17:59:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 9273 invoked by uid 500); 14 Aug 2013 17:59:51 -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 9242 invoked by uid 99); 14 Aug 2013 17:59:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Aug 2013 17:59:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AE6D48BED2A; Wed, 14 Aug 2013 17:59:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 14 Aug 2013 17:59:52 -0000 Message-Id: <23a0ee8532df470aa5fa81f26afb8af9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c5c12de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c5c12de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c5c12de Branch: refs/heads/trunk Commit: 6c5c12de6bd6f9b035501ea3e4dc53497a20b9fe Parents: e3308a1 c1cc50f Author: Aleksey Yeschenko Authored: Wed Aug 14 20:59:35 2013 +0300 Committer: Aleksey Yeschenko Committed: Wed Aug 14 20:59:35 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DefsTables.java | 9 --------- 1 file changed, 9 deletions(-) ----------------------------------------------------------------------