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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Thu Jun 4 19:51:21 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     deacon.udel.edu     
ROOT      /deacon/backroom/ntp-dev/deacon/backroom/ntp-stable
LEVEL     1                   1                   
TIME_T    1396638816          1396638816          
UTC       20140404191336      20140404191336      
VERSION   bk-6.0.3            bk-6.0.3            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.3414, 2015-06-04 15:51:11-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.85
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.213 +0 -0
        Auto merged
        MERGE: 1.202.9.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.9.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.213 +0 -0
        Auto merged
        MERGE: 1.202.9.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.9.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.179 +0 -0
        Auto merged
        MERGE: 1.168.9.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.9.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.213 +0 -0
        Auto merged
        MERGE: 1.202.9.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.9.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.213 +0 -0
        Auto merged
        MERGE: 1.202.9.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.9.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      ChangeLog at 1.1728 +0 -0
        Auto merged
        MERGE: 1.1593.1.70
    
      ntpd/ntp_io.c at 1.402 +0 -0
        Auto merged
        MERGE: 1.399.1.2
    
    ChangeSet at 1.3265.1.85, 2015-06-04 19:39:40+00:00, stenn at psp-at1.ntp.org
      [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ChangeLog at 1.1593.1.70 +1 -0
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/invoke-ntp.conf.texi at 1.168.9.1 +3 -3
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/ntp.conf.5man at 1.202.9.1 +6 -6
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/ntp.conf.5mdoc at 1.202.9.1 +4 -4
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/ntp.conf.def at 1.16 +2 -2
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/ntp.conf.man.in at 1.202.9.1 +6 -6
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
      ntpd/ntp.conf.mdoc.in at 1.202.9.1 +4 -4
        [Bug 2842] Glitch in ntp.conf.def documentation stanza
    
    ChangeSet at 1.3265.1.83, 2015-06-04 03:14:37+00:00, stenn at psp-fb1.ntp.org
      Report select() debug messages at debug level 3 now
    
      ChangeLog at 1.1593.1.69 +1 -1
        Report select() debug messages at debug level 3 now
    
    ChangeSet at 1.3265.1.82, 2015-06-03 17:04:21+02:00, martin at pc-martin.(none)
      Increased the debug level at which a tiny debug message is printed.
    
      ChangeLog at 1.1593.1.68 +1 -0
        Increased the debug level at which a tiny debug message is printed.
    
      ntpd/ntp_io.c at 1.399.1.2 +1 -1
        Increased the debug level at which a tiny debug message is printed.
    


More information about the commitlogs mailing list