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

Harlan Stenn stenn at deacon.udel.edu
Wed May 25 19:12:29 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-1932
LEVEL     1                   1                   
TIME_T    1304737333          1304737333          
UTC       20110507030213      20110507030213      
VERSION   bk-5.2.1            bk-5.2.1            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2530, 2011-05-25 15:12:04-04:00, stenn at deacon.udel.edu
      Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1932
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.2528.1.1
    
      ChangeLog at 1.895 +0 -0
        Auto merged
        MERGE: 1.893.1.1
    
    ChangeSet at 1.2528.1.1, 2011-05-25 07:35:27+00:00, davehart at shiny.ad.hartbrothers.com
      parsesolaris.c compile fails on SPARC Solaris with conflicting printf.
      ntp_util.c compile fails on AIX and OSF with conflicting statsdir.
    
      ChangeLog at 1.893.1.1 +2 -0
        parsesolaris.c compile fails on SPARC Solaris with conflicting printf.
        ntp_util.c compile fails on AIX and OSF with conflicting statsdir.
        
    
      include/ntp_fp.h at 1.24 +11 -2
        parsesolaris.c compile fails on SPARC Solaris with conflicting printf.
    
      include/ntpd.h at 1.163 +1 -4
        ntp_util.c compile fails on AIX and OSF with conflicting statsdir.
    
      ntpd/ntp_util.c at 1.96 +1 -1
        ntp_util.c compile fails on AIX and OSF with conflicting statsdir.
    


More information about the commitlogs mailing list