diff options
| author | gjb <gjb@FreeBSD.org> | 2017-06-29 23:56:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-06-29 23:56:50 +0000 |
| commit | 089c8e1df24857ab7044d425248e773e09a41628 (patch) | |
| tree | 4ab1615432e99c735ffd3b5575e7d56bf464197c | |
| parent | 412877667897dfb62a7df77d89f057251d2418bc (diff) | |
| download | FreeBSD-src-089c8e1df24857ab7044d425248e773e09a41628.zip FreeBSD-src-089c8e1df24857ab7044d425248e773e09a41628.tar.gz | |
- Copy stable/11@r320475 to releng/11.1 as part of the 11.1-RELEASE
cycle.
- Prune svn:mergeinfo from the new branch.
- Bump __FreeBSD_version.
- Rename releng/11.1 to RC1.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 0b3578a..0b22d0b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.1" -BRANCH="BETA3" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index e45cca6..cfb44c3 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100514 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |
