summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-05 13:54:51 -0200
committerRenato Botelho <renato@netgate.com>2016-02-05 13:54:51 -0200
commit12edb8fb64808ccdca681c3a2f91ca3a8dffee05 (patch)
treeb92d95356a5c846a8267ec68ee4ee23c79fa266b /sys/conf
parent6d705f0ca9e210c25ef8bcedc8d728b8586890bf (diff)
parentc716b856dd284bb5dbcf6281e10b3ab9bacf0b15 (diff)
downloadFreeBSD-src-12edb8fb64808ccdca681c3a2f91ca3a8dffee05.zip
FreeBSD-src-12edb8fb64808ccdca681c3a2f91ca3a8dffee05.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
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 70babeca..09695ce 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="PRERELEASE"
+BRANCH="BETA1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud