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 164BC18DDA for ; Thu, 3 Dec 2015 20:42:20 +0000 (UTC) Received: (qmail 37109 invoked by uid 500); 3 Dec 2015 20:42:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37056 invoked by uid 500); 3 Dec 2015 20:42:19 -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 36722 invoked by uid 99); 3 Dec 2015 20:42:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 20:42:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3E04EE682B; Thu, 3 Dec 2015 20:42:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Thu, 03 Dec 2015 20:42:22 -0000 Message-Id: <41b58bee02be4930a467c579e95dad87@git.apache.org> In-Reply-To: <05fca5768f2c4c0180d09a94d23f39b4@git.apache.org> References: <05fca5768f2c4c0180d09a94d23f39b4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1 Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fca24e1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca24e1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca24e1f Branch: refs/heads/trunk Commit: fca24e1fc0d707adeb77471aa349ab9491ea0e97 Parents: b815c78 4b01e8f Author: Benjamin Lerer Authored: Thu Dec 3 21:37:38 2015 +0100 Committer: Benjamin Lerer Committed: Thu Dec 3 21:37:47 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca24e1f/CHANGES.txt ----------------------------------------------------------------------