summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2017-07-20 23:44:39 +0000
committergjb <gjb@FreeBSD.org>2017-07-20 23:44:39 +0000
commitbc19f9718e7b886a1182f8d783b8d0a86c9c9ff8 (patch)
treef98c7ae1f06c45a03681c0c7f31eb3ebb5f91f46
parent5e6bba91f537bbc1af8ff2c2196380ed968f8cb9 (diff)
downloadFreeBSD-src-bc19f9718e7b886a1182f8d783b8d0a86c9c9ff8.zip
FreeBSD-src-bc19f9718e7b886a1182f8d783b8d0a86c9c9ff8.tar.gz
- Set stable/11 from -PRERELEASE back to -STABLE.
- Update version entities in release.ent. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
-rw-r--r--release/doc/share/xml/release.ent6
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 4c5ab8f..c36fd3e 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -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/">
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 41bc615..81eb69d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.1"
-BRANCH="PRERELEASE"
+BRANCH="STABLE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud