From owner-svn-src-stable-11@freebsd.org  Thu Jul 20 23:44:41 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B6BCFEA2A;
 Thu, 20 Jul 2017 23:44:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C82E280EA8;
 Thu, 20 Jul 2017 23:44:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6KNieib097062;
 Thu, 20 Jul 2017 23:44:40 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6KNidgJ097060;
 Thu, 20 Jul 2017 23:44:39 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201707202344.v6KNidgJ097060@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 20 Jul 2017 23:44:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321310 - in stable/11: release/doc/share/xml sys/conf
X-SVN-Group: stable-11
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable/11: release/doc/share/xml sys/conf
X-SVN-Commit-Revision: 321310
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jul 2017 23:44:41 -0000

Author: gjb
Date: Thu Jul 20 23:44:39 2017
New Revision: 321310
URL: https://svnweb.freebsd.org/changeset/base/321310

Log:
  - Set stable/11 from -PRERELEASE back to -STABLE.
  - Update version entities in release.ent.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/doc/share/xml/release.ent
  stable/11/sys/conf/newvers.sh

Modified: stable/11/release/doc/share/xml/release.ent
==============================================================================
--- stable/11/release/doc/share/xml/release.ent	Thu Jul 20 23:39:50 2017	(r321309)
+++ stable/11/release/doc/share/xml/release.ent	Thu Jul 20 23:44:39 2017	(r321310)
@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "11.0-STABLE">
+<!ENTITY release.current "11.1-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -19,10 +19,10 @@
 <!ENTITY release.prev.stable "10.3-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "11.1-RELEASE">
+<!ENTITY release.next "11.2-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "11.0-STABLE">
+<!ENTITY release.branch "11.1-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "https://www.FreeBSD.org/snapshots/">

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu Jul 20 23:39:50 2017	(r321309)
+++ stable/11/sys/conf/newvers.sh	Thu Jul 20 23:44:39 2017	(r321310)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="PRERELEASE"
+BRANCH="STABLE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi