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

Harlan Stenn stenn at deacon.udel.edu
Thu Aug 4 23:20:25 UTC 2011


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    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.2625, 2011-08-04 18:51:13-04:00, stenn at psp-deb1.ntp.org
      sntp autogen regenerate after merge cleanup
    
      sntp/sntp-opts.c at 1.198 +26 -28
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp-opts.def at 1.36 +1 -1
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp-opts.h at 1.198 +9 -9
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp-opts.texi at 1.198 +12 -14
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp.1sntpman at 1.18 +4 -4
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp.1sntpmdoc at 1.18 +4 -4
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp.html at 1.198 +98 -73
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp.man.in at 1.18 +4 -4
        sntp autogen regenerate after merge cleanup
    
      sntp/sntp.mdoc.in at 1.18 +4 -4
        sntp autogen regenerate after merge cleanup
    
    ChangeSet at 1.2624, 2011-08-04 18:43:46-04:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.2082.4.231
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.157 +0 -0
        Auto merged
        MERGE: 1.117.37.2
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.117.37.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.157 +0 -0
        Auto merged
        MERGE: 1.117.37.2
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.117.37.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.156 +0 -0
        Auto merged
        MERGE: 1.117.36.2
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.117.36.2 +0 -0
        Merge rename: sntp/sntp-opts.texi -> BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.156 +0 -0
        Auto merged
        MERGE: 1.117.36.2
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.117.36.2 +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.47 +0 -0
        Auto merged
        MERGE: 1.7.37.2
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.7.37.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914
    
      ChangeLog at 1.994 +0 -6
        Auto merged
        MERGE: 1.496.26.164
    
      sntp/main.c at 1.75 +0 -0
        Auto merged
        MERGE: 1.24.1.10
    
      sntp/sntp-opts.def at 1.35 +2 -11
        merge cleanup
        MERGE: 1.19.1.1
    
    ChangeSet at 1.2623, 2011-08-04 16:25:19-04:00, stenn at psp-deb1.ntp.org
      Merge bk://bk.ntp.org/ntp-dev
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.2620.1.1
    
      ChangeLog at 1.993 +9 -0
        Merge cleanup
        MERGE: 1.990.1.1
    
      sntp/sntp-opts.c at 1.197 +2 -3
        Merge cleanup - will regenerate this next.
        MERGE: 1.195.1.1
    
      sntp/sntp-opts.h at 1.197 +2 -3
        MERGE: 1.195.1.1
    
      sntp/sntp-opts.texi at 1.197 +1 -2
        MERGE: 1.195.1.1
    
      sntp/sntp.1sntpman at 1.17 +0 -2
        MERGE: 1.15.1.1
    
      sntp/sntp.1sntpmdoc at 1.17 +0 -2
        MERGE: 1.15.1.1
    
      sntp/sntp.html at 1.197 +0 -0
        Auto merged
        MERGE: 1.195.1.1
    
      sntp/sntp.man.in at 1.17 +0 -2
        MERGE: 1.15.1.1
    
      sntp/sntp.mdoc.in at 1.17 +0 -2
        MERGE: 1.15.1.1
    
    ChangeSet at 1.2620.1.1, 2011-08-04 16:13:31-04:00, stenn at psp-deb1.ntp.org
      sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      ChangeLog at 1.990.1.1 +2 -0
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/main.c at 1.74 +6 -6
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp-opts.c at 1.195.1.1 +20 -20
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp-opts.def at 1.34 +3 -3
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp-opts.h at 1.195.1.1 +8 -8
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp-opts.texi at 1.195.1.1 +6 -6
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp.1sntpman at 1.15.1.1 +4 -4
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp.1sntpmdoc at 1.15.1.1 +5 -5
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp.html at 1.195.1.1 +7 -7
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp.man.in at 1.15.1.1 +4 -4
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
      sntp/sntp.mdoc.in at 1.15.1.1 +5 -5
        sntp: change -h/--headspace to -g/--gap, and change the default gap from 10 to 50ms
    
    ChangeSet at 1.2082.4.231, 2011-08-04 15:45:08-04:00, stenn at psp-deb1.ntp.org
      [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp-opts.c at 1.117.37.1 +19 -19
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp-opts.h at 1.117.37.1 +7 -7
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp-opts.texi at 1.117.36.1 +30 -29
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp.1 at 1.117.36.1 +8 -8
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp.html at 1.7.37.1 +96 -77
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
    ChangeSet at 1.2082.4.230, 2011-08-04 15:39:31-04:00, stenn at psp-deb1.ntp.org
      [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      ChangeLog at 1.496.26.164 +2 -0
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/main.c at 1.24.1.10 +2 -2
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
      sntp/sntp-opts.def at 1.19.1.1 +9 -14
        [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with ntpd
    
    ChangeSet at 1.2082.4.229, 2011-08-04 15:17:36-04:00, stenn at psp-deb1.ntp.org
      libopts/file.c fix from Bruce Korb (arg-type=file)
    
      ChangeLog at 1.496.26.163 +4 -0
        libopts/file.c fix from Bruce Korb (arg-type=file)
    
      sntp/libopts/file.c at 1.8 +4 -2
        libopts/file.c fix from Bruce Korb (arg-type=file)
    


More information about the commitlogs mailing list