svn commit: r239600 - in stable: 8/etc 9/etc

[Xin LI]

Author: delphij
Date: Thu Aug 23 00:39:08 2012
New Revision: 239600
URL: http://svn.freebsd.org/changeset/base/239600

Log:
  MFC r239464:
  
  As of r232844 we no longer need the maxpoll 9 workaround.

Modified:
  stable/9/etc/ntp.conf
Directory Properties:
  stable/9/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/etc/ntp.conf
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/9/etc/ntp.conf
==============================================================================
--- stable/9/etc/ntp.conf	Wed Aug 22 23:44:12 2012	(r239599)
+++ stable/9/etc/ntp.conf	Thu Aug 23 00:39:08 2012	(r239600)
@@ -18,12 +18,11 @@
 # to the pool. See http://www.pool.ntp.org/join.html if you are interested.
 #
 # The option `iburst' is used for faster initial synchronisation.
-# The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD.
 #
-server 0.freebsd.pool.ntp.org iburst maxpoll 9
-server 1.freebsd.pool.ntp.org iburst maxpoll 9
-server 2.freebsd.pool.ntp.org iburst maxpoll 9
-#server 3.freebsd.pool.ntp.org iburst maxpoll 9
+server 0.freebsd.pool.ntp.org iburst
+server 1.freebsd.pool.ntp.org iburst
+server 2.freebsd.pool.ntp.org iburst
+#server 3.freebsd.pool.ntp.org iburst
 
 #
 # If you want to pick yourself which country's public NTP server
@@ -31,9 +30,9 @@ server 2.freebsd.pool.ntp.org iburst max
 # the next ones and replace CC with the country's abbreviation.
 # Make sure that the hostnames resolve to a proper IP address!
 #
-# server 0.CC.pool.ntp.org iburst maxpoll 9
-# server 1.CC.pool.ntp.org iburst maxpoll 9
-# server 2.CC.pool.ntp.org iburst maxpoll 9
+# server 0.CC.pool.ntp.org iburst
+# server 1.CC.pool.ntp.org iburst
+# server 2.CC.pool.ntp.org iburst
 
 #
 # Security: Only accept NTP traffic from the following hosts.