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 ABE2DD6D3 for ; Wed, 14 Nov 2012 05:34:47 +0000 (UTC) Received: (qmail 20333 invoked by uid 500); 14 Nov 2012 05:34:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20130 invoked by uid 500); 14 Nov 2012 05:34:47 -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 20108 invoked by uid 99); 14 Nov 2012 05:34:46 -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 Nov 2012 05:34:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 88A6055D76; Wed, 14 Nov 2012 05:34:46 +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 X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20121114053446.88A6055D76@tyr.zones.apache.org> Date: Wed, 14 Nov 2012 05:34:46 +0000 (UTC) Updated Branches: refs/heads/trunk e7e3d3e60 -> cee521477 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/cee52147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cee52147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cee52147 Branch: refs/heads/trunk Commit: cee5214777d8cffc7645fe67b2a46363ba83ce3e Parents: e7e3d3e 6f148e6 Author: Dave Brosius Authored: Wed Nov 14 00:33:43 2012 -0500 Committer: Dave Brosius Committed: Wed Nov 14 00:33:43 2012 -0500 ---------------------------------------------------------------------- .../cassandra/streaming/StreamInSession.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------