From owner-svn-src-stable-9@FreeBSD.ORG  Thu Aug 23 00:39:08 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E5AB4106564A;
	Thu, 23 Aug 2012 00:39:08 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF4608FC15;
	Thu, 23 Aug 2012 00:39:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N0d8Te025769;
	Thu, 23 Aug 2012 00:39:08 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N0d8tO025767;
	Thu, 23 Aug 2012 00:39:08 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201208230039.q7N0d8tO025767@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 23 Aug 2012 00:39:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239600 - in stable: 8/etc 9/etc
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 00:39:09 -0000

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.