summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-12 15:03:23 -0300
committerRenato Botelho <renato@netgate.com>2016-08-12 15:03:23 -0300
commit9156c9a1c2ee169229f894fb332a9b7a110db3d8 (patch)
treedd3f771d2cfac8a5a2a446c6b9370be7022ce825 /sys/conf
parent529a654ae2c9fb892722782dd056e36119dfac5a (diff)
parent31dd439280dad5066313b92d89838db63d850228 (diff)
downloadFreeBSD-src-9156c9a1c2ee169229f894fb332a9b7a110db3d8.zip
FreeBSD-src-9156c9a1c2ee169229f894fb332a9b7a110db3d8.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 ed9a2fa..d109806 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud