summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-03 08:55:02 -0300
committerRenato Botelho <renato@netgate.com>2016-05-03 08:55:02 -0300
commit5081bace2b0bdb7140682f44a429ab5ef9e71751 (patch)
treed061b3d4735aaab475bafa19055993adf3dd675f /sys/conf
parent25206d6ba449fcddd116840c00b967fbd620f735 (diff)
parent39baf3a8165fd1fa06257b6812862e7113c5b905 (diff)
downloadFreeBSD-src-5081bace2b0bdb7140682f44a429ab5ef9e71751.zip
FreeBSD-src-5081bace2b0bdb7140682f44a429ab5ef9e71751.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 b9b8d63..33b8007 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud