svn commit: r352547 - in stable/12/sys: conf sys

[Glen Barber]

Author: gjb
Date: Fri Sep 20 00:07:48 2019
New Revision: 352547
URL: https://svnweb.freebsd.org/changeset/base/352547

Log:
  - Set stable/12 back to 'STABLE', now that all work on the 12.1 release
    cycle will take place in the releng/12.1 branch.
  - Bump __FreeBSD_version.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  stable/12/sys/conf/newvers.sh
  stable/12/sys/sys/param.h

Modified: stable/12/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Fri Sep 20 00:05:14 2019	(r352546)
+++ stable/12/sys/conf/newvers.sh	Fri Sep 20 00:07:48 2019	(r352547)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="PRERELEASE"
+BRANCH="STABLE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Fri Sep 20 00:05:14 2019	(r352546)
+++ stable/12/sys/sys/param.h	Fri Sep 20 00:07:48 2019	(r352547)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200519	/* Master, propagated to newvers */
+#define __FreeBSD_version 1201500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,