- Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1 builds.- Update newvers.sh to reflect RC1.- Update __FreeBSD_version to reflect 10.2.- Update default pkg(8) configuration to use the quarterly branch.[1]Discussed with: re, portmgr [1]Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542, 284864,285169-285170,285435:ntp 4.2.8p3.Relnotes: yesApproved by: re (?)
Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
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.