Set tentative merge date, and bump __FreeBSD_version.

CostinCarabas · Mar 4, 2019 · f9134d5 · f9134d5
1 parent ed62a9b
commit f9134d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
@@ -38,9 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 2019mmdd: new libc++ import which bumps version from 7.0.1 to 8.0.0.
+# 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0.
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
-# 2019mmdd: new clang import which bumps version from 7.0.1 to 8.0.0.
+# 20190304: new clang import which bumps version from 7.0.1 to 8.0.0.
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h

diff --git a/UPDATING b/UPDATING
@@ -31,7 +31,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
-2019mmdd:
+20190304:
 	Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to
 	8.0.0.  Please see the 20141231 entry below for information about
 	prerequisites and upgrading, if you are not already using clang 3.5.0

diff --git a/sys/sys/param.h b/sys/sys/param.h
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1300013	/* Master, propagated to newvers */
+#define __FreeBSD_version 1300014	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,