[SCM] linuxptp/master: Add new delay option to the default timemaster.conf

[scorpi-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 54f8761a2e6e63facf0b73c0b9d3d1ad3e852203
Author: Tino Mettler <tino+debian at tikei.de>
Date:   Fri Nov 11 09:40:05 2016 +0100

    Add new delay option to the default timemaster.conf

diff --git a/debian/timemaster.conf b/debian/timemaster.conf
index a9d3663..fd8e77e 100644
--- a/debian/timemaster.conf
+++ b/debian/timemaster.conf
@@ -6,6 +6,7 @@
 
 #[ptp_domain 0]
 #interfaces eth0
+#delay 10e-6
 
 [timemaster]
 ntp_program chronyd
@@ -27,6 +28,6 @@ options -u ntp:ntp -g
 
 [phc2sys]
 path /usr/sbin/phc2sys
-										
+
 [ptp4l]
 path /usr/sbin/ptp4l

-- 
linuxptp packaging