summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-07-26 10:02:40 -0300
committerRenato Botelho <renato@netgate.com>2016-07-26 10:02:40 -0300
commit3aafa4252efbb84e0797340dedf426616ea050ff (patch)
tree86cd3d2b7d616930ac7cb43b92d47373e5343c04 /sys/conf
parent7307492dde2abb993381ae1d139aa23199919593 (diff)
parent3a81e075fa773707432d8e3f71cbc9348670536e (diff)
downloadFreeBSD-src-3aafa4252efbb84e0797340dedf426616ea050ff.zip
FreeBSD-src-3aafa4252efbb84e0797340dedf426616ea050ff.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 b0022a6..ed9a2fa 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud