Re: svn commit: r193635 - head/etc

2009-06-18 Thread Doug Barton
Dag-Erling Smørgrav wrote: > Edwin Groothuis writes: >> Author: edwin >> Date: Sun Jun 7 13:26:57 2009 >> New Revision: 193635 >> URL: http://svn.freebsd.org/changeset/base/193635 >> >> Log: >> Welcome to a default installed /etc/ntp.conf > > Great, now mergemaster blew away my ntp.conf and in

Re: svn commit: r193635 - head/etc

2009-06-18 Thread Dag-Erling Smørgrav
Edwin Groothuis writes: > Author: edwin > Date: Sun Jun 7 13:26:57 2009 > New Revision: 193635 > URL: http://svn.freebsd.org/changeset/base/193635 > > Log: > Welcome to a default installed /etc/ntp.conf Great, now mergemaster blew away my ntp.conf and installed this one instead. Apparently, i

svn commit: r193635 - head/etc

2009-06-07 Thread Edwin Groothuis
Author: edwin Date: Sun Jun 7 13:26:57 2009 New Revision: 193635 URL: http://svn.freebsd.org/changeset/base/193635 Log: Welcome to a default installed /etc/ntp.conf This NTP configuration file points to the [012].pool.ntp.org servers, which will return a list of geographical local NTP se