MFC r338126: MFV r338092: ntp 4.2.8p12.Relnotes: yes
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
This commit was generated by cvs2svn to compensate for changes in r56746,which included commits to RCS files with non-trunk default branches.
Virgin import of ntpd 4.0.99b
Virgin import of ntpd 4.0.98f