From owner-svn-src-all@FreeBSD.ORG  Thu Apr  3 01:02:14 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC97BB2C;
 Thu,  3 Apr 2014 01:02:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A90241AF;
 Thu,  3 Apr 2014 01:02:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3312ExU074626;
 Thu, 3 Apr 2014 01:02:14 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3312EnM074625;
 Thu, 3 Apr 2014 01:02:14 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201404030102.s3312EnM074625@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 3 Apr 2014 01:02:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r264061 - stable/9/cddl/contrib/opensolaris/cmd/zpool
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 01:02:14 -0000

Author: delphij
Date: Thu Apr  3 01:02:14 2014
New Revision: 264061
URL: http://svnweb.freebsd.org/changeset/base/264061

Log:
  MFC r263385:
  
  Remove unused option -r from zpool.
  
  Submitted by:	Richard Yao <ryao gentoo org>

Modified:
  stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/cmd/zpool/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Apr  3 01:00:51 2014	(r264060)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Thu Apr  3 01:02:14 2014	(r264061)
@@ -1961,7 +1961,7 @@ zpool_do_import(int argc, char **argv)
 	char *endptr;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:rR:T:VX")) != -1) {
+	while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:R:T:VX")) != -1) {
 		switch (c) {
 		case 'a':
 			do_all = B_TRUE;