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

[Glen Barber]

Author: gjb
Date: Thu Jul 23 23:35:20 2015
New Revision: 285831
URL: https://svnweb.freebsd.org/changeset/base/285831

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

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	Thu Jul 23 23:31:40 2015	(r285830)
+++ stable/10/sys/conf/newvers.sh	Thu Jul 23 23:35:20 2015	(r285831)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.2"
-BRANCH="BETA2"
+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	Thu Jul 23 23:31:40 2015	(r285830)
+++ stable/10/sys/sys/param.h	Thu Jul 23 23:35:20 2015	(r285831)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1001519	/* Master, propagated to newvers */
+#define __FreeBSD_version 1002500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,