summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2017-09-15 00:31:25 +0000
committerMarius Strobl <marius@FreeBSD.org>2017-09-15 00:31:25 +0000
commit683e74bedfccebf41f8aeb649e244fa4fab0a80c (patch)
tree081d6be93b9f2ca5f27cab91f835074d0a28c74d
parentecaf15cfd372bf42934bbb90e05beb59a684e7f9 (diff)
Notes
-rw-r--r--release/pkg_repos/release-dvd.conf2
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/sys/param.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
index 34997f2c7067..957fe68a6c6a 100644
--- a/release/pkg_repos/release-dvd.conf
+++ b/release/pkg_repos/release-dvd.conf
@@ -1,6 +1,6 @@
# $FreeBSD$
release: {
- url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_4",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ea7247e75bcd..9580cd2fe754 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.4"
-BRANCH="BETA4"
+BRANCH="RC1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ca1ecfc1d875..adc62169e0b5 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 1003516 /* Master, propagated to newvers */
+#define __FreeBSD_version 1004000 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,