diff options
author | Renato Botelho <renato@netgate.com> | 2018-08-15 07:45:07 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2018-08-15 07:45:07 -0300 |
commit | 7bb6999b14af77ce661707e690076af413796b6a (patch) | |
tree | dd5aac93b38e24a87b991f31910aa1dcec5b7ce3 /sys/conf | |
parent | 349c67ad08dee706c9f713075ebd79c95d29f942 (diff) | |
parent | 544d31706a541930a2b8f8984b7bd25861011b91 (diff) | |
download | FreeBSD-src-7bb6999b14af77ce661707e690076af413796b6a.zip FreeBSD-src-7bb6999b14af77ce661707e690076af413796b6a.tar.gz |
Merge remote-tracking branch 'origin/releng/11.2' into RELENG_2_4_4
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/newvers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 1807fa2..9639642 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |