summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2018-12-12 08:22:00 -0200
committerRenato Botelho <renato@netgate.com>2018-12-12 08:22:00 -0200
commit518496b29ae0ab6da2a9512efa1425bfdba7b1c2 (patch)
tree1f2a067ea465db4f4ab216a65794140b33d755b2 /sys/conf
parentb9fb429df5834b29d053138065fe4c3718b5e41f (diff)
parent888fdfbae1e6345c054a031e3d996b1f3a19149b (diff)
downloadFreeBSD-src-518496b29ae0ab6da2a9512efa1425bfdba7b1c2.zip
FreeBSD-src-518496b29ae0ab6da2a9512efa1425bfdba7b1c2.tar.gz
Merge remote-tracking branch 'origin/releng/11.2' into RELENG_2_4_4
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 bd3610f..8aa6c26 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.2"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p6"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud