Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASEcycle.Prune svn:mergeinfo from the new branch, and rename it to RC1.Update __FreeBSD_version.Use the quarterly branch for the default FreeBSD.conf pkg(8) repo andthe dvd1.iso packages population.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.Prune svn:mergeinfo from the new branch, as nothing has been mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
MFV ntp 4.2.8p1 (r258945, r275970, r276091, r276092, r276093, r278284)Thanks to roberto for providing pointers to wedge this into HEAD.Approved by: roberto
Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commitwill update usr.sbin/ntp to match this.MFC after: 2 weeks
Import ntp 4.2.4p5 in the vendor code area. Far too many changes to list here,please see CommitLog for detailed changes.XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts with the detect-merge-conflict.sh script in our repo.