[ntp:commitlogs] incoming pull in deacon.udel.edu:/deacon/backroom/ntp-dev

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Mon Mar 16 09:52:11 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-deb1.ntp.org    
ROOT      /deacon/backroom/ntp-dev/home/stenn/ntp-dev 
LEVEL     1                   1                   
TIME_T    1396638816          1425999324          
UTC       20140404191336      20150310145524      
VERSION   bk-6.0.3            bk-6.1.3            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.3326, 2015-03-16 09:24:25+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1645 +4 -2
        merge cleanup
    
    ChangeSet at 1.3325, 2015-03-16 09:23:05+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2763
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2763
      MERGE: 1.3265.14.3
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.173 +0 -0
        Auto merged
        MERGE: 1.168.3.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.3.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      ChangeLog at 1.1644 +0 -0
        Auto merged
        MERGE: 1.1593.14.3
    
    ChangeSet at 1.3265.14.3, 2015-03-16 09:17:42+00:00, stenn at psp-fb1.ntp.org
      [Bug 2763] Allow different thresholds for forward and backward steps
    
      ChangeLog at 1.1593.14.3 +1 -0
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      include/ntp.h at 1.211 +13 -11
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      include/ntpd.h at 1.185 +2 -1
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/invoke-ntp.conf.texi at 1.168.3.1 +15 -2
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/keyword-gen-utd at 1.22 +1 -1
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/keyword-gen.c at 1.27 +2 -0
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp.conf.5man at 1.202.3.1 +19 -4
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp.conf.5mdoc at 1.202.3.1 +18 -3
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp.conf.def at 1.15 +16 -1
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp.conf.man.in at 1.202.3.1 +19 -4
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp.conf.mdoc.in at 1.202.3.1 +18 -3
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_config.c at 1.323 +8 -0
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_keyword.h at 1.24 +492 -483
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_loopfilter.c at 1.179 +27 -5
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_parser.c at 1.90 +803 -797
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_parser.h at 1.56 +81 -77
        [Bug 2763] Allow different thresholds for forward and backward steps
    
      ntpd/ntp_parser.y at 1.83 +4 -0
        [Bug 2763] Allow different thresholds for forward and backward steps
    


More information about the commitlogs mailing list