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

Harlan Stenn stenn at deacon.udel.edu
Wed Sep 7 11:26:44 UTC 2011


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-deb1.ntp.org    
ROOT      /deacon/backroom/ntp-dev/home/hart/ntp-dev-2003
LEVEL     1                   1                   
TIME_T    1304737333          1313182656          
UTC       20110507030213      20110812205736      
VERSION   bk-5.2.1            bk-5.3              

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2672, 2011-09-07 05:05:12+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2003
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2003
      MERGE: 1.2082.4.235
    
      ChangeLog at 1.1031 +2 -1
        routine 4.2.6 to 4.2.7 ChangeLog merge
        MERGE: 1.496.26.168
    
      ntpq/libntpq.c at 1.11 +4 -21
        easy, only slight merge conflict.
        MERGE: 1.3.1.6
    
      ntpq/libntpq.h at 1.8 +0 -0
        Auto merged
        MERGE: 1.3.1.4
    
    ChangeSet at 1.2082.4.235, 2011-09-07 04:29:25+00:00, davehart at shiny.ad.hartbrothers.com
      [Bug 2003] libntpq ntpq_read_assoc_peervars() broken.
    
      ChangeLog at 1.496.26.168 +1 -0
        [Bug 2003] libntpq ntpq_read_assoc_peervars() broken.
    
      ntpq/libntpq.c at 1.3.1.6 +56 -66
        [Bug 2003] libntpq ntpq_read_assoc_peervars() broken.
    
      ntpq/libntpq.h at 1.3.1.4 +1 -1
        [Bug 2003] libntpq ntpq_read_assoc_peervars() broken.
    


More information about the commitlogs mailing list