svn commit: r296374 - in stable/10/sys: conf sys

[Marius Strobl]

Author: marius
Date: Fri Mar  4 01:29:09 2016
New Revision: 296374
URL: https://svnweb.freebsd.org/changeset/base/296374

Log:
  - Reset stable/10 back to -PRERELEASE status now that releng/10.3
    has been branched.
  - Update __FreeBSD_version to reflect the new -STABLE branch.
  
  Approved by:	re (implicit)

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

Modified: stable/10/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh	Fri Mar  4 01:27:38 2016	(r296373)
+++ stable/10/sys/conf/newvers.sh	Fri Mar  4 01:29:09 2016	(r296374)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.3"
-BRANCH="BETA3"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Fri Mar  4 01:27:38 2016	(r296373)
+++ stable/10/sys/sys/param.h	Fri Mar  4 01:29:09 2016	(r296374)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1002509	/* Master, propagated to newvers */
+#define __FreeBSD_version 1003500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,