summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-04 13:54:12 -0300
committerRenato Botelho <renato@netgate.com>2016-05-04 13:54:12 -0300
commit070f476d8d2dddb76f93080010293ab127bd4f59 (patch)
tree01543addc15d8020760e3c38bc63a069965b47fc /sys/conf
parentb174bde150957ccfa49627f93aa2c0fcd966eb62 (diff)
parent1fbf92c3ea82371bfc10d47cb9dc715a18f1287b (diff)
downloadFreeBSD-src-070f476d8d2dddb76f93080010293ab127bd4f59.zip
FreeBSD-src-070f476d8d2dddb76f93080010293ab127bd4f59.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 33b8007..5ad43e3 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud