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 D2F8A9D5B for ; Mon, 13 Feb 2012 15:58:29 +0000 (UTC) Received: (qmail 33763 invoked by uid 500); 13 Feb 2012 15:58:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 33727 invoked by uid 500); 13 Feb 2012 15:58:29 -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 33714 invoked by uid 99); 13 Feb 2012 15:58:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Feb 2012 15:58:29 +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; Mon, 13 Feb 2012 15:58:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5FD2931F9D8; Mon, 13 Feb 2012 15:58:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120213155806.5FD2931F9D8@tyr.zones.apache.org> Date: Mon, 13 Feb 2012 15:58:06 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/cassandra-1.1 6a6bf3cf1 -> 9a842c7b3 refs/heads/trunk ddc771dc5 -> 232da8248 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/232da824 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/232da824 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/232da824 Branch: refs/heads/trunk Commit: 232da8248072991dc521d1fe579a55679ea6c735 Parents: ddc771d 9a842c7 Author: Jonathan Ellis Authored: Mon Feb 13 09:57:53 2012 -0600 Committer: Jonathan Ellis Committed: Mon Feb 13 09:57:53 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 4 +- .../apache/cassandra/thrift/CassandraServer.java | 121 ++++++++------- 2 files changed, 69 insertions(+), 56 deletions(-) ----------------------------------------------------------------------