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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Fri May 1 10:02:06 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.3365, 2015-05-01 09:31:38+00:00, stenn at psp-at1.ntp.org
      Merge psp-at1.ntp.org:/home/stenn/ntp-stable-2650
      into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2650
      MERGE: 1.3265.28.12
    
      ChangeLog at 1.1683 +3 -1
        Merge cleanup
        MERGE: 1.1593.28.7
    
    ChangeSet at 1.3265.28.12, 2015-05-01 09:25:56+00:00, stenn at psp-at1.ntp.org
      [Bug 2650] fix includefile processing
    
      ChangeLog at 1.1593.28.7 +1 -0
        [Bug 2650] fix includefile processing
    
    ChangeSet at 1.3265.33.2, 2015-05-01 01:08:05+02:00, jnperlin at hydra.(none)
      [Bug 2650] includefile processing broken.
        rework and cleanup of config processing after merge from 4.2.8p2
    
      ntpd/keyword-gen.c at 1.28 +0 -2
        [Bug 2650] includefile processing broken.
          rework and cleanup of config processing after merge from 4.2.8p2
    
      ntpd/ntp_parser.c at 1.92 +405 -412
        [Bug 2650] includefile processing broken.
          rework and cleanup of config processing after merge from 4.2.8p2
    
      ntpd/ntp_scanner.c at 1.48 +56 -45
        [Bug 2650] includefile processing broken.
          rework and cleanup of config processing after merge from 4.2.8p2
    
      ntpd/ntp_scanner.h at 1.20 +8 -1
        [Bug 2650] includefile processing broken.
          rework and cleanup of config processing after merge from 4.2.8p2
    
    ChangeSet at 1.3265.33.1, 2015-04-29 20:12:23+02:00, jnperlin at hydra.(none)
      Merge perlinger at psp-deb1.ntp.org:ntp-stable-2650
      into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-2650
      MERGE: 1.3265.7.21
    
      ntpd/ntp_config.c at 1.324 +0 -0
        Auto merged
        MERGE: 1.322.1.1
    
      ntpd/ntp_parser.c at 1.91 +116 -403
        Merge perlinger at psp-deb1.ntp.org:ntp-stable-2650
        into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-2650
        MERGE: 1.89.1.1
    
      ntpd/ntp_parser.h at 1.57 +0 -0
        Auto merged
        MERGE: 1.55.1.1
    
      ntpd/ntp_parser.y at 1.84 +0 -0
        Auto merged
        MERGE: 1.82.1.1
    
    ChangeSet at 1.3265.7.21, 2015-04-29 20:07:39+02:00, jnperlin at hydra.(none)
      [bug 2650] includefile processing broken
        forward from lost/orphaned repo
    
      ntpd/ntp_config.c at 1.322.1.1 +20 -38
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    
      ntpd/ntp_parser.c at 1.89.1.1 +404 -411
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    
      ntpd/ntp_parser.h at 1.55.1.1 +2 -2
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    
      ntpd/ntp_parser.y at 1.82.1.1 +43 -51
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    
      ntpd/ntp_scanner.c at 1.47 +297 -128
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    
      ntpd/ntp_scanner.h at 1.19 +27 -22
        [bug 2650] includefile processing broken
          forward from lost/orphaned repo
    


More information about the commitlogs mailing list