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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Sun Jun 14 05:21:07 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.3448, 2015-06-14 01:20:54-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.126
    
      ChangeLog at 1.1758 +0 -0
        SCCS merged
        MERGE: 1.1593.1.63
    
      bootstrap at 1.49 +0 -30
        Auto merged
        MERGE: 1.47.1.1
    
      ntpd/ntp_io.c at 1.403 +0 -0
        Auto merged
        MERGE: 1.400.1.1
    
      tests/libntp/a_md5encrypt.c at 1.7 +0 -17
        Auto merged
        MERGE: 1.5.1.1
    
    ChangeSet at 1.3265.1.126, 2015-06-14 05:15:48+00:00, stenn at psp-at1.ntp.org
      [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq-subs.c at 1.108 +5 -4
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
    ChangeSet at 1.3265.1.125, 2015-06-14 03:18:13+00:00, stenn at psp-at1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1593.1.63 +1 -1
        merge cleanup
    
    ChangeSet at 1.3265.1.124, 2015-06-14 03:03:56+00:00, stenn at psp-at1.ntp.org
      Merge bk://bk.ntp.org/ntp-stable
      into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2805
      MERGE: 1.3265.36.12
    
      ChangeLog at 1.1593.1.62 +0 -0
        Auto merged
        MERGE: 1.1593.32.12
    
      ntpd/ntp_io.c at 1.400.1.1 +0 -0
        Auto merged
        MERGE: 1.399.1.2
    
    ChangeSet at 1.3265.1.123, 2015-06-14 00:10:48+00:00, stenn at psp-at1.ntp.org
      Unity updates
    
      bootstrap at 1.47.1.1 +30 -13
        Unity updates
    
      tests/libntp/Makefile.am at 1.56 +133 -148
        Unity updates
    
      tests/libntp/a_md5encrypt.c at 1.5.1.1 +17 -15
        Unity updates
    
      tests/libntp/run-test-a_md5encrypt.c at 1.7 +5 -5
        Unity updates
    
    ChangeSet at 1.3265.1.122, 2015-06-13 18:35:19+00:00, stenn at psp-at1.ntp.org
      Makefile.am unity-related cleanup
    
      tests/bug-2803/run-bug-2803.c at 1.3 +5 -2
        template update
    
      tests/libntp/Makefile.am at 1.55 +148 -133
        Makefile.am unity-related cleanup
    
    ChangeSet at 1.3265.36.12, 2015-05-09 04:27:15+00:00, stenn at psp-at1.ntp.org
      Merge bk://bk.ntp.org/ntp-stable
      into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2805
      MERGE: 1.3265.37.2
    
      ChangeLog at 1.1593.32.12 +0 -0
        Auto merged
        MERGE: 1.1593.33.1
    
    ChangeSet at 1.3265.37.1, 2015-05-06 00:06:51+00:00, stenn at psp-at1.ntp.org
      Merge bk://bk.ntp.org/ntp-stable
      into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2805
      MERGE: 1.3265.33.1
    
      ChangeLog at 1.1593.33.1 +1 -1
        Merge cleanup
        MERGE: 1.1593.31.1
    


More information about the commitlogs mailing list