From owner-svn-src-all@FreeBSD.ORG  Mon Aug 18 02:32:49 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89929FA7;
 Mon, 18 Aug 2014 02:32:49 +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 74FA53DCD;
 Mon, 18 Aug 2014 02:32:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7I2Wn58082658;
 Mon, 18 Aug 2014 02:32:49 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7I2WnOv082657;
 Mon, 18 Aug 2014 02:32:49 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201408180232.s7I2WnOv082657@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ache set sender to ache@FreeBSD.org
 using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Mon, 18 Aug 2014 02:32:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270121 - stable/10
X-SVN-Group: stable-10
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.18-1
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: Mon, 18 Aug 2014 02:32:49 -0000

Author: ache
Date: Mon Aug 18 02:32:48 2014
New Revision: 270121
URL: http://svnweb.freebsd.org/changeset/base/270121

Log:
  Direct commit to stable/10 reflecting r269815 because rest can't be merged
  
  Add otp-sha

Modified:
  stable/10/ObsoleteFiles.inc

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Mon Aug 18 02:13:45 2014	(r270120)
+++ stable/10/ObsoleteFiles.inc	Mon Aug 18 02:32:48 2014	(r270121)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140811: otp-sha renamed to otp-sha1
+OLD_FILES+=usr/bin/otp-sha
+OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140812: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h