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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Wed Jun 3 09:35:21 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.3410, 2015-06-03 09:32:11+00:00, stenn at psp-at1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1726 +2 -1
        merge cleanup
    
    ChangeSet at 1.3409, 2015-06-03 09:31:10+00:00, stenn at psp-at1.ntp.org
      Merge psp-at1.ntp.org:/home/stenn/ntp-stable
      into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.1.81
    
      ChangeLog at 1.1725 +0 -0
        Auto merged
        MERGE: 1.1593.1.67
    
      ntpd/ntp_io.c at 1.401 +0 -0
        Auto merged
        MERGE: 1.399.1.1
    
    ChangeSet at 1.3265.1.81, 2015-06-03 09:30:35+00:00, stenn at psp-at1.ntp.org
      [Bug 2837] Allow a configurable DSCP value
    
      ChangeLog at 1.1593.1.67 +2 -1
        [Bug 2837] Allow a configurable DSCP value
    
      html/miscopt.html at 1.81 +2 -0
        [Bug 2837] Allow a configurable DSCP value
    
      include/ntp_io.h at 1.22 +1 -0
        [Bug 2837] Allow a configurable DSCP value
    
      ntpd/keyword-gen.c at 1.29 +1 -0
        [Bug 2837] Allow a configurable DSCP value
    
      ntpd/ntp_config.c at 1.326 +8 -1
        [Bug 2837] Allow a configurable DSCP value
    
      ntpd/ntp_io.c at 1.399.1.1 +5 -5
        [Bug 2837] Allow a configurable DSCP value
    
      ntpd/ntp_parser.y at 1.85 +13 -0
        [Bug 2837] Allow a configurable DSCP value
    


More information about the commitlogs mailing list