From owner-svn-src-all@freebsd.org Sat Apr 16 18:10:12 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D53DB1106A; Sat, 16 Apr 2016 18:10:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A7311120; Sat, 16 Apr 2016 18:10:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GIAB0w075918; Sat, 16 Apr 2016 18:10:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GIABA1075917; Sat, 16 Apr 2016 18:10:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201604161810.u3GIABA1075917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 16 Apr 2016 18:10:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298123 - head/contrib/ntp/ntpd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 18:10:12 -0000 Author: gjb Date: Sat Apr 16 18:10:11 2016 New Revision: 298123 URL: https://svnweb.freebsd.org/changeset/base/298123 Log: Remove the RCSID line from ntp_control.c, and set the fbsd:nokeywords property. This should have been done a while back (certainly before mergeing projects/release-pkg to head), but I fixed the merge conflicts and forgot to correct the real problem afterward. Noticed by: peter Sponsored by: The FreeBSD Foundation Modified: head/contrib/ntp/ntpd/ntp_control.c (contents, props changed) Modified: head/contrib/ntp/ntpd/ntp_control.c ============================================================================== --- head/contrib/ntp/ntpd/ntp_control.c Sat Apr 16 18:07:44 2016 (r298122) +++ head/contrib/ntp/ntpd/ntp_control.c Sat Apr 16 18:10:11 2016 (r298123) @@ -3,10 +3,6 @@ * traps. Provides service to ntpq and others. */ -/* - * $FreeBSD: projects/release-pkg/contrib/ntp/ntpd/ntp_control.c 277386 2015-01-19 16:15:12Z gjb $ - */ - #ifdef HAVE_CONFIG_H # include #endif