summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-06-06 08:06:12 -0300
committerRenato Botelho <renato@netgate.com>2016-06-06 08:06:12 -0300
commitb8fc3766b95248624cbead2c73cc735489d9af89 (patch)
treec080ee967e51f2a045ea84afd306c29d4fdbf62d /sys/conf
parent95be4fb0378e88b4a64a2da93e8ef4611475a916 (diff)
parent1c978b35b9ee5349b17431da32fc8f413549f4ce (diff)
downloadFreeBSD-src-b8fc3766b95248624cbead2c73cc735489d9af89.zip
FreeBSD-src-b8fc3766b95248624cbead2c73cc735489d9af89.tar.gz
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/newvers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 142bd8a..b0022a6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p5"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud