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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Fri Apr 3 08:57:47 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.3353, 2015-04-03 08:36:22+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1671 +2 -0
        merge cleanup
    
    ChangeSet at 1.3352, 2015-04-03 08:33:07+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.1.52
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.83 +0 -0
        Auto merged
        MERGE: 1.76.4.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.5.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.100 +0 -0
        Auto merged
        MERGE: 1.93.4.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.4.2 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.87 +0 -0
        Auto merged
        MERGE: 1.80.4.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.101 +0 -0
        Auto merged
        MERGE: 1.94.4.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.4.2 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.507 +0 -0
        Auto merged
        MERGE: 1.500.5.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.5.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.5.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.81 +0 -0
        Auto merged
        MERGE: 1.74.4.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.5.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.505 +0 -0
        Auto merged
        MERGE: 1.498.5.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.504 +0 -0
        Auto merged
        MERGE: 1.497.5.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.5.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.160 +0 -0
        Auto merged
        MERGE: 1.153.4.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.4.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.5.2 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.78 +0 -0
        Auto merged
        MERGE: 1.71.4.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.5.2 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.509 +0 -0
        Auto merged
        MERGE: 1.502.5.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.5.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.87 +0 -0
        Auto merged
        MERGE: 1.80.5.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.503 +0 -1
        Merge cleanup
        MERGE: 1.492.4.2
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.4.2 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.100 +0 -0
        Auto merged
        MERGE: 1.93.4.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.4.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.503 +0 -0
        Auto merged
        MERGE: 1.496.5.2
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.5.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.330 +0 -0
        Auto merged
        MERGE: 1.323.5.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.4.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.326 +0 -0
        Auto merged
        MERGE: 1.319.5.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.164 +0 -0
        Auto merged
        MERGE: 1.157.4.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.4.2 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.4.2 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.99 +0 -0
        Auto merged
        MERGE: 1.92.4.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.486 +0 -0
        Auto merged
        MERGE: 1.479.5.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.5.2 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.489 +0 -0
        Auto merged
        MERGE: 1.482.5.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.5.2 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.492 +0 -0
        Auto merged
        MERGE: 1.485.5.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.5.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.168 +0 -0
        Auto merged
        MERGE: 1.161.4.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.488 +0 -0
        Auto merged
        MERGE: 1.481.5.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.5.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.99 +0 -0
        Auto merged
        MERGE: 1.92.5.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.488 +0 -0
        Auto merged
        MERGE: 1.481.5.2
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.5.2 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.169 +0 -0
        Auto merged
        MERGE: 1.162.4.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.45 +0 -0
        Auto merged
        MERGE: 1.38.5.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.163 +0 -0
        Auto merged
        MERGE: 1.156.4.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.4.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.176 +0 -0
        Auto merged
        MERGE: 1.168.6.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.6.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.509 +0 -0
        Auto merged
        MERGE: 1.502.6.2
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.6.2 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.505 +0 -0
        Auto merged
        MERGE: 1.498.5.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.5.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.172 +0 -0
        Auto merged
        MERGE: 1.165.5.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.5.2 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.508 +0 -0
        Auto merged
        MERGE: 1.501.6.2
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.6.2 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.506 +0 -0
        Auto merged
        MERGE: 1.499.5.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.502 +0 -0
        Auto merged
        MERGE: 1.495.5.2
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.5.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.309 +0 -0
        Auto merged
        MERGE: 1.302.5.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.5.2 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.506 +0 -0
        Auto merged
        MERGE: 1.499.5.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.5.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.485 +0 -0
        Auto merged
        MERGE: 1.478.5.2
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.5.2 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.503 +0 -0
        Auto merged
        MERGE: 1.496.5.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.5.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.158 +0 -0
        Auto merged
        MERGE: 1.151.4.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.101 +0 -0
        Auto merged
        MERGE: 1.94.4.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.4.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.500 +0 -0
        Auto merged
        MERGE: 1.493.5.2
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.5.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1670 +0 -0
        Auto merged
        MERGE: 1.1593.1.39
    
      scripts/update-leap/invoke-update-leap.texi at 1.6 +0 -1
        Merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap-opts at 1.6 +0 -2
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.1update-leapman at 1.6 +0 -3
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.6 +0 -1
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.html at 1.6 +0 -6
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.man.in at 1.6 +0 -3
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.mdoc.in at 1.6 +0 -1
        merge cleanup
        MERGE: 1.1.1.2
    
    ChangeSet at 1.3265.1.52, 2015-04-03 03:56:38-04:00, stenn at deacon.udel.edu
      NTP_4_2_8P2_RC3
      TAG: NTP_4_2_8P2_RC3
    
      ChangeLog at 1.1593.1.39 +1 -0
        NTP_4_2_8P2_RC3
    
      ntpd/invoke-ntp.conf.texi at 1.168.6.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/invoke-ntp.keys.texi at 1.165.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/invoke-ntpd.texi at 1.481.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.conf.5man at 1.202.6.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.conf.5mdoc at 1.202.6.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.conf.html at 1.161.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.conf.man.in at 1.202.6.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.conf.mdoc.in at 1.202.6.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.keys.5man at 1.199.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.keys.5mdoc at 1.199.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.keys.html at 1.162.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.keys.man.in at 1.199.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpd/ntp.keys.mdoc.in at 1.199.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd-opts.c at 1.502.6.1 +7 -7
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd-opts.h at 1.501.6.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd.1ntpdman at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd.1ntpdmdoc at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd.html at 1.156.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd.man.in at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpd/ntpd.mdoc.in at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpdc/invoke-ntpdc.texi at 1.479.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc-opts.c at 1.497.5.1 +7 -7
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc-opts.h at 1.496.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc.1ntpdcman at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc.html at 1.323.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc.man.in at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpdc/ntpdc.mdoc.in at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpq/invoke-ntpq.texi at 1.485.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq-opts.c at 1.502.5.1 +7 -7
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq-opts.h at 1.500.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq.1ntpqman at 1.313.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq.1ntpqmdoc at 1.313.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq.html at 1.153.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq.man.in at 1.313.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpq/ntpq.mdoc.in at 1.313.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.481.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.499.5.1 +7 -7
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.498.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd.html at 1.151.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd.man.in at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      packageinfo.sh at 1.492.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.72.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.72.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/calc_tickadj.html at 1.74.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.71.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.72.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.76.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/invoke-plot_summary.texi at 1.93.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/invoke-summary.texi at 1.93.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.302.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait-opts at 1.38.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.300.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.300.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait.html at 1.319.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait.man.in at 1.300.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.300.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.91.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep-opts at 1.40.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.79.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.79.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep.html at 1.92.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep.man.in at 1.79.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.80.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.91.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace-opts at 1.40.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.79.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.79.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace.html at 1.92.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace.man.in at 1.79.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.80.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary-opts at 1.40.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary.1plot_summaryman at 1.91.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary.1plot_summarymdoc at 1.91.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary.html at 1.94.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary.man.in at 1.91.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/plot_summary.mdoc.in at 1.91.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/summary-opts at 1.40.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/summary.1summaryman at 1.91.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/summary.1summarymdoc at 1.91.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/summary.html at 1.94.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/summary.man.in at 1.91.4.1 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/summary.mdoc.in at 1.91.4.1 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/invoke-update-leap.texi at 1.1.1.2 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap-opts at 1.1.1.2 +2 -2
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap.1update-leapman at 1.1.1.2 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.1.1.2 +1 -1
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap.html at 1.1.1.2 +6 -5
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap.man.in at 1.1.1.2 +3 -3
        NTP_4_2_8P2_RC3
    
      scripts/update-leap/update-leap.mdoc.in at 1.1.1.2 +1 -1
        NTP_4_2_8P2_RC3
    
      sntp/invoke-sntp.texi at 1.478.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      sntp/sntp-opts.c at 1.496.5.1 +7 -7
        NTP_4_2_8P2_RC3
    
      sntp/sntp-opts.h at 1.495.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      sntp/sntp.1sntpman at 1.313.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      sntp/sntp.1sntpmdoc at 1.313.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      sntp/sntp.html at 1.493.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      sntp/sntp.man.in at 1.313.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      sntp/sntp.mdoc.in at 1.313.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      util/invoke-ntp-keygen.texi at 1.482.5.1 +2 -2
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen-opts.c at 1.499.5.1 +7 -7
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen-opts.h at 1.498.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen.1ntp-keygenman at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen.html at 1.157.4.1 +2 -2
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen.man.in at 1.310.5.1 +3 -3
        NTP_4_2_8P2_RC3
    
      util/ntp-keygen.mdoc.in at 1.310.5.1 +1 -1
        NTP_4_2_8P2_RC3
    
    ChangeSet at 1.3265.1.51, 2015-04-03 03:35:54-04:00, stenn at deacon.udel.edu
      [Bug 2763] Fix for different thresholds for forward and backward steps
    
      ChangeLog at 1.1593.1.38 +3 -0
        [Bug 2763] Fix for different thresholds for forward and backward steps
    
      ntpd/ntp_loopfilter.c at 1.183 +2 -2
        [Bug 2763] Fix for different thresholds for forward and backward steps
    


More information about the commitlogs mailing list