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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Wed Jul 29 10:19:46 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-at1.ntp.org     
ROOT      /deacon/backroom/ntp-dev/a/etc/amd.stage/thump2-g3/export/ntp/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.3573, 2015-07-29 10:11:20+00:00, stenn at psp-at1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1883 +6 -0
        merge cleanup
    
    ChangeSet at 1.3572, 2015-07-29 10:07:05+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.284
    
      ChangeLog at 1.1882 +0 -0
        Auto merged
        MERGE: 1.1593.1.143
    
    ChangeSet at 1.3265.1.284, 2015-07-29 10:04:53+00:00, stenn at psp-at1.ntp.org
      ChangeLog cleanup
    
      ChangeLog at 1.1593.1.143 +5 -3
        ChangeLog cleanup
    
    ChangeSet at 1.3265.1.283, 2015-07-29 12:01:10+02:00, viperus at ubuntu.(none)
      ChangeLog:
        updated ChangeLog
    
      ChangeLog at 1.1593.1.142 +3 -1
        updated ChangeLog
    
    ChangeSet at 1.3265.1.282, 2015-07-29 13:33:34+05:30, loki at dadasgift.(none)
      Merge lokeshw24 at psp-deb1:/home/viperus/ntp-stable-unity
      into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity
      MERGE: 1.3265.89.1
    
      tests/ntpd/Makefile.am at 1.12 +10 -13
        Resolved conflict.
        MERGE: 1.6.2.1
    
    ChangeSet at 1.3265.89.1, 2015-07-29 13:18:47+05:30, loki at dadasgift.(none)
      ntp_util
    
      tests/ntpd/Makefile.am at 1.6.2.1 +13 -10
    
    ChangeSet at 1.3265.1.281, 2015-07-28 13:45:40+02:00, viperus at ubuntu.(none)
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
      into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity
      MERGE: 1.3265.87.18
    
      tests/libntp/Makefile.am at 1.90 +0 -0
        Auto merged
        MERGE: 1.87.1.1
    
      tests/libntp/decodenetnum.c at 1.6 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
      tests/libntp/hextolfp.c at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      tests/libntp/lfptest.h at 1.8 +0 -0
        SCCS merged
        MERGE: 1.5.1.2
    
      tests/libntp/lfptostr.c at 1.6 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
      tests/libntp/netof.c at 1.6 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
      tests/libntp/octtoint.c at 1.6 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
      tests/libntp/run-socktoa.c at 1.10 +0 -6
        Auto merged
        MERGE: 1.8.1.1
    
      tests/libntp/socktoa.c at 1.6 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
      tests/libntp/strtolfp.c at 1.5 +0 -0
        Auto merged
        MERGE: 1.3.1.1
    
      tests/ntpd/Makefile.am at 1.11 +0 -0
        SCCS merged
        MERGE: 1.6.1.4
    
    ChangeSet at 1.3265.87.18, 2015-07-27 19:46:25+02:00, viperus at ubuntu.(none)
      Many files:
        update
        
      run-leapsec.c:
        minor change
      run-ntp_scanner.c, run-decodenetnum.c:
        update
      ntp_scanner.c:
        Added more tests
      lfptest.h:
        minor move after merge with lokesh
      Makefile.am:
        Merge
    
      tests/libntp/lfptest.h at 1.5.1.2 +0 -16
        minor move after merge with lokesh
    
      tests/libntp/run-decodenetnum.c at 1.7 +1 -0
        update
    
      tests/libntp/run-lfptostr.c at 1.6 +11 -11
        update
        
    
      tests/libntp/run-netof.c at 1.6 +0 -1
        update
        
    
      tests/libntp/run-socktoa.c at 1.9 +6 -6
        update
        
    
      tests/ntpd/Makefile.am at 1.6.1.4 +8 -3
        Merge
    
      tests/ntpd/ntp_scanner.c at 1.2 +30 -2
        Added more tests
    
      tests/ntpd/run-leapsec.c at 1.4 +9 -3
        minor change
    
      tests/ntpd/run-ntp_scanner.c at 1.2 +7 -1
        update
    
      tests/ntpd/run-ntp_signd.c at 1.3 +2 -2
        update
        
    
      tests/ntpd/run-rc_cmdlength.c at 1.2 +8 -3
        update
        
    
    ChangeSet at 1.3265.87.17, 2015-07-26 21:48:29+02:00, viperus at ubuntu.(none)
      run-ntp_scanner.c, ntp_scanner.c:
        new file
    
      tests/ntpd/ntp_scanner.c at 1.1 +29 -0
        BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/ntp_scanner.c
    
      tests/ntpd/ntp_scanner.c at 1.0 +0 -0
    
      tests/ntpd/run-ntp_scanner.c at 1.1 +55 -0
        BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/run-ntp_scanner.c
    
      tests/ntpd/run-ntp_scanner.c at 1.0 +0 -0
    
    ChangeSet at 1.3265.87.16, 2015-07-26 21:34:45+02:00, viperus at ubuntu.(none)
    
      tests/ntpd/Makefile.am at 1.6.1.3 +20 -1
    
      tests/ntpd/ntp_signd.c at 1.2 +3 -1
    
      tests/ntpd/run-ntp_signd.c at 1.2 +9 -3
    
    ChangeSet at 1.3265.87.15, 2015-07-26 21:00:42+02:00, viperus at ubuntu.(none)
      Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity
      into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity
      MERGE: 1.3265.84.7
    
      tests/libntp/Makefile.am at 1.87.1.1 +0 -0
        Auto merged
        MERGE: 1.85.1.4
    
      tests/libntp/decodenetnum.c at 1.5 +0 -0
        Merged Damir (mine) and Lokesh changes
        MERGE: 1.3.1.1
    
      tests/libntp/hextolfp.c at 1.6.1.1 +0 -0
        Auto merged
        MERGE: 1.5.1.1
    
      tests/libntp/lfptest.h at 1.5.1.1 +16 -7
        Merged Damir (mine) and Lokesh changes
        
        MERGE: 1.4.1.3
    
      tests/libntp/lfptostr.c at 1.5 +0 -0
        Merged Damir (mine) and Lokesh changes
        
        MERGE: 1.3.1.1
    
      tests/libntp/netof.c at 1.5 +0 -0
        Merged Damir (mine) and Lokesh changes
        
        MERGE: 1.3.1.1
    
      tests/libntp/octtoint.c at 1.5 +0 -0
        Merged Damir (mine) and Lokesh changes
        
        MERGE: 1.3.1.1
    
      tests/libntp/socktoa.c at 1.4.1.1 +0 -0
        Auto merged
        MERGE: 1.3.1.1
    
      tests/libntp/strtolfp.c at 1.4 +0 -0
        Merged Damir (mine) and Lokesh changes
        
        MERGE: 1.2.1.1
    
      tests/ntpd/Makefile.am at 1.6.1.2 +0 -0
        Auto merged
        MERGE: 1.4.1.1
    
    ChangeSet at 1.3265.84.7, 2015-07-24 12:01:24+05:30, loki at dadasgift.(none)
      ntp signd testing
    
      tests/ntpd/ntp_signd.c at 1.1 +24 -0
        BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/ntp_signd.c
    
      tests/ntpd/ntp_signd.c at 1.0 +0 -0
    
    ChangeSet at 1.3265.84.6, 2015-07-24 11:55:00+05:30, loki at dadasgift.(none)
      ntp_signd test changes
    
      tests/ntpd/Makefile.am at 1.6.1.1 +21 -0
    
      tests/ntpd/run-ntp_signd.c at 1.1 +52 -0
        BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/run-ntp_signd.c
    
      tests/ntpd/run-ntp_signd.c at 1.0 +0 -0
    


More information about the commitlogs mailing list