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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Wed Apr 27 06:57:54 UTC 2016


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.3690, 2016-04-27 06:51:43+00: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.3265.1.404
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.224 +0 -0
        Auto merged
        MERGE: 1.202.20.3
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.20.3 +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.93 +0 -0
        Auto merged
        MERGE: 1.76.14.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.14.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.89 +0 -0
        Auto merged
        MERGE: 1.72.15.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.15.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.216 +0 -0
        Auto merged
        MERGE: 1.199.15.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.15.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.110 +0 -0
        Auto merged
        MERGE: 1.93.14.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.14.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.96 +0 -0
        Auto merged
        MERGE: 1.79.14.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.14.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.97 +0 -0
        Auto merged
        MERGE: 1.80.14.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.14.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.15.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.111 +0 -0
        Auto merged
        MERGE: 1.94.14.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.14.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.518 +0 -0
        Auto merged
        MERGE: 1.500.16.3
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.16.3 +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.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.14.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.57 +0 -0
        Auto merged
        MERGE: 1.40.15.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.15.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.57 +0 -0
        Auto merged
        MERGE: 1.40.15.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.15.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.331 +0 -0
        Auto merged
        MERGE: 1.313.16.3
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.16.3 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.216 +0 -0
        Auto merged
        MERGE: 1.199.15.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.15.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.91 +0 -0
        Auto merged
        MERGE: 1.74.14.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.14.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.89 +0 -0
        Auto merged
        MERGE: 1.72.15.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.15.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.515 +0 -0
        Auto merged
        MERGE: 1.498.15.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.15.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.514 +0 -0
        Auto merged
        MERGE: 1.497.15.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.15.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.330 +0 -0
        Auto merged
        MERGE: 1.313.15.2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.15.2 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.170 +0 -0
        Auto merged
        MERGE: 1.153.14.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.14.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.15.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.57 +0 -0
        Auto merged
        MERGE: 1.40.15.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.15.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.88 +0 -0
        Auto merged
        MERGE: 1.71.14.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.14.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.108 +0 -0
        Auto merged
        MERGE: 1.91.15.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.15.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.216 +0 -0
        Auto merged
        MERGE: 1.199.15.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.15.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.520 +0 -0
        Auto merged
        MERGE: 1.502.16.3
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.16.3 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.97 +0 -0
        Auto merged
        MERGE: 1.80.15.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.15.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.15.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.513 +0 -0
        Auto merged
        MERGE: 1.492.14.3
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.14.3 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.110 +0 -0
        Auto merged
        MERGE: 1.93.14.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.14.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.15.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.513 +0 -0
        Auto merged
        MERGE: 1.496.15.2
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.15.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.330 +0 -0
        Auto merged
        MERGE: 1.313.15.2
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.15.2 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.15.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.15.2 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.340 +0 -0
        Auto merged
        MERGE: 1.323.15.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.15.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.89 +0 -0
        Auto merged
        MERGE: 1.72.14.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.14.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.336 +0 -0
        Auto merged
        MERGE: 1.319.15.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.15.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.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.14.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.14.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.330 +0 -0
        Auto merged
        MERGE: 1.313.15.2
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.15.2 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.15.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.174 +0 -0
        Auto merged
        MERGE: 1.157.14.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.14.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.331 +0 -0
        Auto merged
        MERGE: 1.313.16.3
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.16.3 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.96 +0 -0
        Auto merged
        MERGE: 1.79.14.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.14.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.14.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.330 +0 -0
        Auto merged
        MERGE: 1.313.15.2
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.15.2 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.109 +0 -0
        Auto merged
        MERGE: 1.92.14.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.14.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.496 +0 -0
        Auto merged
        MERGE: 1.479.15.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.15.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.96 +0 -0
        Auto merged
        MERGE: 1.79.14.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.14.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.499 +0 -0
        Auto merged
        MERGE: 1.482.15.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.15.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.503 +0 -0
        Auto merged
        MERGE: 1.485.16.3
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.16.3 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.179 +0 -0
        Auto merged
        MERGE: 1.161.15.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.15.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.498 +0 -0
        Auto merged
        MERGE: 1.481.15.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.15.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.109 +0 -0
        Auto merged
        MERGE: 1.92.15.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.15.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.498 +0 -0
        Auto merged
        MERGE: 1.481.15.2
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.15.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.15.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.179 +0 -0
        Auto merged
        MERGE: 1.162.14.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.14.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.317 +0 -0
        Auto merged
        MERGE: 1.300.15.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.15.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.317 +0 -0
        Auto merged
        MERGE: 1.300.14.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.14.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.224 +0 -0
        Auto merged
        MERGE: 1.202.20.3
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.20.3 +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.55 +0 -0
        Auto merged
        MERGE: 1.38.15.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.15.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.331 +0 -0
        Auto merged
        MERGE: 1.313.16.3
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.16.3 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.173 +0 -0
        Auto merged
        MERGE: 1.156.14.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.14.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.190 +0 -0
        Auto merged
        MERGE: 1.168.20.3
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.20.3 +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.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.14.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.519 +0 -0
        Auto merged
        MERGE: 1.502.16.2
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.16.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.317 +0 -0
        Auto merged
        MERGE: 1.300.14.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.14.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.15.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.515 +0 -0
        Auto merged
        MERGE: 1.498.15.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.15.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.224 +0 -0
        Auto merged
        MERGE: 1.202.20.3
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.20.3 +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.182 +0 -0
        Auto merged
        MERGE: 1.165.15.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.15.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.224 +0 -0
        Auto merged
        MERGE: 1.202.20.3
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.20.3 +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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.15.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.317 +0 -0
        Auto merged
        MERGE: 1.300.15.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.15.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.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.14.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.15.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.331 +0 -0
        Auto merged
        MERGE: 1.313.16.3
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.16.3 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.96 +0 -0
        Auto merged
        MERGE: 1.79.14.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.14.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.518 +0 -0
        Auto merged
        MERGE: 1.501.16.2
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.16.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.516 +0 -0
        Auto merged
        MERGE: 1.499.15.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.15.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.512 +0 -0
        Auto merged
        MERGE: 1.495.15.2
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.15.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.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.14.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.15.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.96 +0 -0
        Auto merged
        MERGE: 1.79.15.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.15.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.319 +0 -0
        Auto merged
        MERGE: 1.302.15.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.15.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.15.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.15.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.15.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.327 +0 -0
        Auto merged
        MERGE: 1.310.15.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.15.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.57 +0 -0
        Auto merged
        MERGE: 1.40.15.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.15.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.516 +0 -0
        Auto merged
        MERGE: 1.499.15.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.15.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.96 +0 -0
        Auto merged
        MERGE: 1.79.14.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.14.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.216 +0 -0
        Auto merged
        MERGE: 1.199.15.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.15.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.495 +0 -0
        Auto merged
        MERGE: 1.478.15.2
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.15.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.513 +0 -0
        Auto merged
        MERGE: 1.496.15.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.15.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.168 +0 -0
        Auto merged
        MERGE: 1.151.14.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.14.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.14.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.111 +0 -0
        Auto merged
        MERGE: 1.94.14.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.14.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.108 +0 -0
        Auto merged
        MERGE: 1.91.14.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.14.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.510 +0 -0
        Auto merged
        MERGE: 1.493.15.2
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.15.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1988 +4 -3
        Merge cleanup
        MERGE: 1.1593.1.227
    
      NEWS at 1.149 +0 -0
        Auto merged
        MERGE: 1.130.1.39
    
      configure.ac at 1.602 +0 -0
        Auto merged
        MERGE: 1.581.1.24
    
      ntpd/ntp_io.c at 1.413 +0 -0
        Auto merged
        MERGE: 1.400.1.16
    
      ntpq/ntpq.c at 1.169 +0 -0
        Auto merged
        MERGE: 1.155.1.14
    
      scripts/update-leap/invoke-update-leap.texi at 1.95 +0 -1
        Use the dev version in -dev
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap-opts at 1.95 +0 -2
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap.1update-leapman at 1.95 +0 -3
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.95 +0 -2
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap.html at 1.95 +0 -1
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap.man.in at 1.95 +0 -3
        MERGE: 1.1.1.13
    
      scripts/update-leap/update-leap.mdoc.in at 1.95 +0 -2
        MERGE: 1.1.1.13
    
    ChangeSet at 1.3265.1.404, 2016-04-26 20:30:51-04:00, stenn at deacon.udel.edu
      NTP_4_2_8P7
      TAG: NTP_4_2_8P7
    
      ChangeLog at 1.1593.1.227 +1 -0
        NTP_4_2_8P7
    
      ntpd/invoke-ntp.conf.texi at 1.168.20.2 +38 -20
        NTP_4_2_8P7
    
      ntpd/invoke-ntp.keys.texi at 1.165.15.1 +1 -1
        NTP_4_2_8P7
    
      ntpd/invoke-ntpd.texi at 1.481.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntp.conf.5man at 1.202.20.2 +43 -24
        NTP_4_2_8P7
    
      ntpd/ntp.conf.5mdoc at 1.202.20.2 +40 -18
        NTP_4_2_8P7
    
      ntpd/ntp.conf.html at 1.161.15.1 +34 -10
        NTP_4_2_8P7
    
      ntpd/ntp.conf.man.in at 1.202.20.2 +43 -24
        NTP_4_2_8P7
    
      ntpd/ntp.conf.mdoc.in at 1.202.20.2 +40 -18
        NTP_4_2_8P7
    
      ntpd/ntp.keys.5man at 1.199.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntp.keys.5mdoc at 1.199.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntp.keys.html at 1.162.14.1 +1 -1
        NTP_4_2_8P7
    
      ntpd/ntp.keys.man.in at 1.199.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntp.keys.mdoc.in at 1.199.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntpd-opts.c at 1.502.16.1 +7 -7
        NTP_4_2_8P7
    
      ntpd/ntpd-opts.h at 1.501.16.1 +3 -3
        NTP_4_2_8P7
    
      ntpd/ntpd.1ntpdman at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpd/ntpd.1ntpdmdoc at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntpd.html at 1.156.14.1 +2 -2
        NTP_4_2_8P7
    
      ntpd/ntpd.man.in at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpd/ntpd.mdoc.in at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpdc/invoke-ntpdc.texi at 1.479.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpdc/ntpdc-opts.c at 1.497.15.1 +7 -7
        NTP_4_2_8P7
    
      ntpdc/ntpdc-opts.h at 1.496.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpdc/ntpdc.1ntpdcman at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpdc/ntpdc.html at 1.323.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpdc/ntpdc.man.in at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpdc/ntpdc.mdoc.in at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpq/invoke-ntpq.texi at 1.485.16.2 +2 -2
        NTP_4_2_8P7
    
      ntpq/ntpq-opts.c at 1.502.16.2 +7 -7
        NTP_4_2_8P7
    
      ntpq/ntpq-opts.h at 1.500.16.2 +3 -3
        NTP_4_2_8P7
    
      ntpq/ntpq.1ntpqman at 1.313.16.2 +3 -3
        NTP_4_2_8P7
    
      ntpq/ntpq.1ntpqmdoc at 1.313.16.2 +2 -2
        NTP_4_2_8P7
    
      ntpq/ntpq.html at 1.153.14.1 +36 -6
        NTP_4_2_8P7
    
      ntpq/ntpq.man.in at 1.313.16.2 +3 -3
        NTP_4_2_8P7
    
      ntpq/ntpq.mdoc.in at 1.313.16.2 +2 -2
        NTP_4_2_8P7
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.481.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.499.15.1 +7 -7
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.498.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd.html at 1.151.14.1 +1 -1
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd.man.in at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      packageinfo.sh at 1.492.14.2 +2 -2
        NTP_4_2_8P7
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.72.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.72.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/calc_tickadj/calc_tickadj.html at 1.74.14.1 +1 -1
        NTP_4_2_8P7
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.71.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.72.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.76.14.1 +1 -1
        NTP_4_2_8P7
    
      scripts/invoke-plot_summary.texi at 1.93.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/invoke-summary.texi at 1.93.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.302.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait-opts at 1.38.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.300.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.300.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait.html at 1.319.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait.man.in at 1.300.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.300.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.91.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep-opts at 1.40.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.79.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.79.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep.html at 1.92.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep.man.in at 1.79.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.80.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.91.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace-opts at 1.40.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.79.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.79.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace.html at 1.92.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace.man.in at 1.79.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.80.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/plot_summary-opts at 1.40.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/plot_summary.1plot_summaryman at 1.91.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/plot_summary.1plot_summarymdoc at 1.91.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/plot_summary.html at 1.94.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/plot_summary.man.in at 1.91.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/plot_summary.mdoc.in at 1.91.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/summary-opts at 1.40.15.1 +2 -2
        NTP_4_2_8P7
    
      scripts/summary.1summaryman at 1.91.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/summary.1summarymdoc at 1.91.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/summary.html at 1.94.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/summary.man.in at 1.91.14.1 +3 -3
        NTP_4_2_8P7
    
      scripts/summary.mdoc.in at 1.91.14.1 +2 -2
        NTP_4_2_8P7
    
      scripts/update-leap/invoke-update-leap.texi at 1.1.1.13 +1 -1
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap-opts at 1.1.1.13 +2 -2
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap.1update-leapman at 1.1.1.13 +3 -3
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.1.1.13 +2 -2
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap.html at 1.1.1.13 +1 -1
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap.man.in at 1.1.1.13 +3 -3
        NTP_4_2_8P7
    
      scripts/update-leap/update-leap.mdoc.in at 1.1.1.13 +2 -2
        NTP_4_2_8P7
    
      sntp/invoke-sntp.texi at 1.478.15.1 +2 -2
        NTP_4_2_8P7
    
      sntp/sntp-opts.c at 1.496.15.1 +7 -7
        NTP_4_2_8P7
    
      sntp/sntp-opts.h at 1.495.15.1 +3 -3
        NTP_4_2_8P7
    
      sntp/sntp.1sntpman at 1.313.15.1 +3 -3
        NTP_4_2_8P7
    
      sntp/sntp.1sntpmdoc at 1.313.15.1 +2 -2
        NTP_4_2_8P7
    
      sntp/sntp.html at 1.493.15.1 +2 -2
        NTP_4_2_8P7
    
      sntp/sntp.man.in at 1.313.15.1 +3 -3
        NTP_4_2_8P7
    
      sntp/sntp.mdoc.in at 1.313.15.1 +2 -2
        NTP_4_2_8P7
    
      util/invoke-ntp-keygen.texi at 1.482.15.1 +2 -2
        NTP_4_2_8P7
    
      util/ntp-keygen-opts.c at 1.499.15.1 +7 -7
        NTP_4_2_8P7
    
      util/ntp-keygen-opts.h at 1.498.15.1 +3 -3
        NTP_4_2_8P7
    
      util/ntp-keygen.1ntp-keygenman at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
      util/ntp-keygen.html at 1.157.14.1 +2 -2
        NTP_4_2_8P7
    
      util/ntp-keygen.man.in at 1.310.15.1 +3 -3
        NTP_4_2_8P7
    
      util/ntp-keygen.mdoc.in at 1.310.15.1 +2 -2
        NTP_4_2_8P7
    
    ChangeSet at 1.3265.1.403, 2016-04-26 20:07:48-04:00, stenn at deacon.udel.edu
      ntp-4.2.8p7
    
      packageinfo.sh at 1.492.14.1 +1 -1
        ntp-4.2.8p7
    
    ChangeSet at 1.3265.1.402, 2016-04-26 23:24:25+00:00, stenn at psp-deb1.ntp.org
      4.2.8p7 documentation cleanup
    
      ChangeLog at 1.1593.1.226 +9 -9
        4.2.8p7 documentation cleanup
    
      NEWS at 1.130.1.39 +123 -36
        4.2.8p7 documentation cleanup
    
    ChangeSet at 1.3265.1.401, 2016-04-24 09:17:06+00:00, stenn at psp-deb1.ntp.org
      [Bug 3036] autokey trips an INSIST in authistrustedip()
    
      ntpd/ntp_proto.c at 1.386 +0 -1
        [Bug 3036] autokey trips an INSIST in authistrustedip()
    
    ChangeSet at 1.3265.1.400, 2016-04-21 23:42:43+00:00, stenn at psp-deb1.ntp.org
      Update 3007
    
      NEWS at 1.130.1.38 +1 -1
        Update 3007
    
    ChangeSet at 1.3265.1.399, 2016-04-21 23:29:30+00:00, stenn at psp-deb1.ntp.org
      [Bug 3007] Fix bug in crypto-NAK check
    
      ChangeLog at 1.1593.1.225 +1 -1
        [Bug 3007] Fix bug in crypto-NAK check
    
      ntpd/ntp_proto.c at 1.385 +3 -1
        [Bug 3007] Fix bug in crypto-NAK check
    
    ChangeSet at 1.3265.1.398, 2016-04-21 09:29:31+00:00, stenn at psp-deb1.ntp.org
      [Bug 3036] autokey trips an INSIST in authistrustedip()
    
      NEWS at 1.130.1.37 +1 -0
        [Bug 3036] autokey trips an INSIST in authistrustedip()
    
    ChangeSet at 1.3265.1.397, 2016-04-21 09:27:40+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.17
    
      ChangeLog at 1.1593.1.224 +0 -0
        Auto merged
        MERGE: 1.1593.97.15
    
      ntpd/ntp_proto.c at 1.384 +1 -1
        Merge Cleanup
        MERGE: 1.373.2.7
    
    ChangeSet at 1.3265.1.396, 2016-04-21 09:24:12+00:00, stenn at psp-deb1.ntp.org
      tweak some ntp_proto.c timestamp log messages
    
      ntpd/ntp_proto.c at 1.383 +4 -3
        tweak some ntp_proto.c timestamp log messages
    
    ChangeSet at 1.3265.140.17, 2016-04-21 09:11:51+00:00, stenn at psp-deb1.ntp.org
      [Bug 3036] autokey trips an INSIST in authistrustedip()
    
      ChangeLog at 1.1593.97.15 +1 -0
        [Bug 3036] autokey trips an INSIST in authistrustedip()
    
      ntpd/ntp_proto.c at 1.373.2.7 +6 -1
        [Bug 3036] autokey trips an INSIST in authistrustedip()
    
    ChangeSet at 1.3265.1.395, 2016-04-19 05:29:57+00:00, stenn at psp-deb1.ntp.org
      Windows cleanup for Bug 2978 mitigation
    
      ports/winnt/include/config.h at 1.114 +6 -0
        Windows cleanup for Bug 2978 mitigation
    
    ChangeSet at 1.3265.1.394, 2016-04-18 05:38:06+00:00, stenn at psp-deb1.ntp.org
      4.2.8p7 update: [Bug 2831] Segmentation Fault in DNS lookup during startup
    
      NEWS at 1.130.1.36 +2 -0
        4.2.8p7 update: [Bug 2831] Segmentation Fault in DNS lookup during startup
    
    ChangeSet at 1.3265.1.393, 2016-04-18 05:22:19+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2831
      MERGE: 1.3265.156.1
    
      ChangeLog at 1.1593.1.223 +2 -2
        Merge cleanup
        MERGE: 1.1593.113.1
    
      libntp/work_fork.c at 1.16 +0 -0
        Auto merged
        MERGE: 1.14.1.1
    
    ChangeSet at 1.3265.156.1, 2016-04-18 06:07:25+02:00, perlinger at ntp.org
      [Bug 2831]  Segmentation Fault in DNS lookup during startup.
       - fixed yet another race condition in the threaded resolver code.
    
      ChangeLog at 1.1593.113.1 +2 -0
        [Bug 2831]  Segmentation Fault in DNS lookup during startup.
         - fixed yet another race condition in the threaded resolver code.
    
      include/ntp_worker.h at 1.7 +2 -0
        [Bug 2831]  Segmentation Fault in DNS lookup during startup.
         - fixed yet another race condition in the threaded resolver code: global locker prototype
    
      libntp/ntp_intres.c at 1.100 +20 -28
        [Bug 2831]  Segmentation Fault in DNS lookup during startup.
         - fixed yet another race condition in the threaded resolver code:
            lock global context table during access
            remove dangerous wrapper
    
      libntp/work_fork.c at 1.14.1.1 +5 -0
        [Bug 2831]  Segmentation Fault in DNS lookup during startup.
         - fixed yet another race condition in the threaded resolver code: global locker dummy
    
      libntp/work_thread.c at 1.21 +23 -0
        [Bug 2831]  Segmentation Fault in DNS lookup during startup.
         - fixed yet another race condition in the threaded resolver code: create&handle global lock
    
    ChangeSet at 1.3265.1.392, 2016-04-16 07:59:23+00:00, stenn at psp-deb1.ntp.org
      type
    
      NEWS at 1.130.1.35 +1 -1
        type
    
    ChangeSet at 1.3265.1.391, 2016-04-14 09:03:11+00:00, stenn at psp-deb1.ntp.org
      Update the NEWS file for 4.2.8p7
    
      NEWS at 1.130.1.34 +7 -0
        Update the NEWS file for 4.2.8p7
    
    ChangeSet at 1.3265.1.390, 2016-04-14 01:59:45+00:00, stenn at psp-deb1.ntp.org
      [Sec 2978] Interleave can be partially triggered
    
      ChangeLog at 1.1593.1.222 +1 -0
        [Sec 2978] Interleave can be partially triggered
    
      configure.ac at 1.581.1.24 +22 -0
        [Sec 2978] Interleave can be partially triggered
    
      ntpd/ntp_proto.c at 1.382 +11 -3
        [Sec 2978] Interleave can be partially triggered
    
    ChangeSet at 1.3265.1.389, 2016-04-14 01:46:50+00:00, stenn at psp-deb1.ntp.org
      Update the NEWS file for 4.2.8p7
    
      NEWS at 1.130.1.33 +168 -26
        Update the NEWS file for 4.2.8p7
    
    ChangeSet at 1.3265.1.388, 2016-04-12 22:29:18+00:00, stenn at psp-deb1.ntp.org
      4.2.8p7 prep
    
      NEWS at 1.130.1.32 +105 -5
        4.2.8p7 prep
    
    ChangeSet at 1.3265.1.387, 2016-04-12 09:01:09+00:00, stenn at psp-deb1.ntp.org
      Credit Aleksandr Kostikov on bug 3019
    
      ChangeLog at 1.1593.1.221 +1 -0
        Credit Aleksandr Kostikov on bug 3019
    
    ChangeSet at 1.3265.1.386, 2016-04-12 08:18:50+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.16
    
      ChangeLog at 1.1593.1.220 +0 -0
        Auto merged
        MERGE: 1.1593.97.14
    
      include/ntp.h at 1.219 +0 -0
        Auto merged
        MERGE: 1.216.1.1
    
      ntpd/ntp_io.c at 1.400.1.16 +0 -0
        Auto merged
        MERGE: 1.400.4.2
    
      ntpd/ntp_proto.c at 1.381 +0 -0
        Auto merged
        MERGE: 1.373.2.6
    
      ports/winnt/vs2013/libntp/libntp.vcxproj.filters at 1.9 +0 -0
        Auto merged
        MERGE: 1.7.1.1
    
    ChangeSet at 1.3265.140.16, 2016-04-12 07:56:46+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3031
      MERGE: 1.3265.154.6
    
      ChangeLog at 1.1593.97.14 +5 -5
        merge cleanup
        MERGE: 1.1593.111.2
    
      libntp/ntp_worker.c at 1.9 +0 -1
        Auto merged
        MERGE: 1.7.1.1
    
      ntpd/ntp_io.c at 1.400.4.2 +0 -1
        Merge cleanup
        MERGE: 1.400.5.2
    
    ChangeSet at 1.3265.154.6, 2016-04-12 07:43:08+00:00, stenn at psp-deb1.ntp.org
      comment tweak
    
      ntpd/ntp_proto.c at 1.373.2.6 +1 -1
        comment tweak
    
    ChangeSet at 1.3265.140.15, 2016-04-12 06:20:40+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3019-clean
      MERGE: 1.3265.153.1
    
      ChangeLog at 1.1593.97.13 +2 -2
        Merge cleanup
        MERGE: 1.1593.110.1
    
    ChangeSet at 1.3265.1.385, 2016-04-11 20:26:29-07:00, harlan at max.pfcs.com
      [Bug 2952] Symmetric active/passive mode is broken
    
      ChangeLog at 1.1593.1.219 +1 -0
        [Bug 2952] Symmetric active/passive mode is broken
    
      ntpd/ntp_proto.c at 1.380 +21 -12
        [Bug 2952] Symmetric active/passive mode is broken
    
    ChangeSet at 1.3265.1.384, 2016-04-11 19:56:06-07:00, harlan at max.pfcs.com
      Cleanup to include/ntp.h
    
      ChangeLog at 1.1593.1.218 +1 -0
        Cleanup to include/ntp.h
    
      include/ntp.h at 1.218 +7 -0
        cleanup
    
    ChangeSet at 1.3265.154.5, 2016-04-01 19:18:25+02:00, jnperlin at nemesis.localnet
      [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed
       - adjust pull cycle of broadcast client to trensmission of brodcast server
    
      libntp/ntp_worker.c at 1.7.1.1 +1 -1
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed
         - side kick: fix annoying signed/unsigned clash
    
      ntpd/ntp_proto.c at 1.373.2.5 +1 -0
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed
         - adjust pull cycle of broadcast client to trensmission of brodcast server
    
    ChangeSet at 1.3265.154.4, 2016-03-30 23:55:33+02:00, jnperlin at nemesis.localnet
      [Bug 3031] modify deadband
    
      ntpd/ntp_proto.c at 1.373.2.4 +13 -12
        [Bug 3031] broadcast issues
         - modify deadband for first round after volley
    
    ChangeSet at 1.3265.154.3, 2016-03-30 22:15:04+02:00, jnperlin at nemesis.localnet
      Merge ssh://perlinger@psp-deb1.ntp.org/ntp-stable-3031
      into  nemesis.localnet:C:/Data/ntp-dev/src/ntp-stable-3031
      MERGE: 1.3265.155.1
    
      ChangeLog at 1.1593.111.2 +0 -5
        Auto merged
        MERGE: 1.1593.112.1
    
      ntpd/ntp_io.c at 1.400.5.2 +0 -28
        Auto merged
        MERGE: 1.400.6.1
    
      ntpd/ntp_proto.c at 1.373.2.3 +0 -23
        Auto merged
        MERGE: 1.373.3.1
    
    ChangeSet at 1.3265.155.1, 2016-03-30 17:28:04+00:00, perlinger at psp-deb1.ntp.org
      [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
       - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds
         the cutoff limit. (default 50ms)
         Retry again after the next broadcast packet.
    
      ChangeLog at 1.1593.112.1 +5 -0
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
    
      ntpd/ntp_io.c at 1.400.6.1 +28 -10
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
         - improve/fix handling of opening broadcast sockets (-> EADDRNOTAVAIL)
    
      ntpd/ntp_proto.c at 1.373.3.1 +23 -4
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
         - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms.
           Retry again after the next broadcast packet.
         - the absolute value of negative broadcastdelays is cutoff limit for peer removal.
    
    ChangeSet at 1.3265.154.2, 2016-03-30 19:23:06+02:00, jnperlin at nemesis.localnet
      [Bug 3031]
    
      ntpd/ntp_io.c at 1.400.5.1 +28 -10
        [Bug 3031]
         - improve/fix handling of opening broadcast sockets (-> EADDRNOTAVAIL)
    
      ntpd/ntp_proto.c at 1.373.2.2 +14 -6
        [Bug 3031]
         - the absolute value of negative broadcastdelays is cutoff limit for peer removal
    
    ChangeSet at 1.3265.1.383, 2016-03-30 10:35:59+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.14
    
      ChangeLog at 1.1593.1.217 +2 -2
        Merge cleanup
        MERGE: 1.1593.97.12
    
    ChangeSet at 1.3265.140.14, 2016-03-30 10:29:07+00:00, stenn at psp-deb1.ntp.org
      [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
      ChangeLog at 1.1593.97.12 +2 -0
        [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
      libntp/work_fork.c at 1.15 +1 -1
        [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
      ntpd/ntp_timer.c at 1.96 +6 -0
        [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
      ntpd/ntpd.c at 1.171 +15 -0
        [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
      sntp/m4/ntp_libntp.m4 at 1.33 +1 -0
        [Bug 2960] async name resolution fixes for chroot() environments.  Reinhard Max
    
    ChangeSet at 1.3265.154.1, 2016-03-29 18:22:03+02:00, perlinger at ntp.org
      [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
       - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms.
         Retry again after the next broadcast packet.
    
      ChangeLog at 1.1593.111.1 +5 -0
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
    
      ntpd/ntp_proto.c at 1.373.2.1 +11 -0
        [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed.
         - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms.
           Retry again after the next broadcast packet.
    
    ChangeSet at 1.3265.153.1, 2016-03-27 23:59:51+02:00, jnperlin at nemesis.localnet
      [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
       - complete refurbishment of overlapped IO engine
       - cleanup
    
      ChangeLog at 1.1593.110.1 +2 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
          - work around windows network issues, improve overlapped IO. perlinger at ntp.org
    
      include/ntp.h at 1.216.1.1 +1 -0
        [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE
         - add IOCPL registration handle to interface
    
      include/ntp_refclock.h at 1.38 +2 -1
        [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE
         - add IOCPL registration handle to RIO structure
    
      include/recvbuff.h at 1.26 +2 -2
        [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE
         - fix SOCKET vs. FD clash
         - 'get_free_recv_buffer_alloc()': extended comment
    
      libntp/ntp_worker.c at 1.8 +1 -1
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
          - fix signed/unsigned clash
    
      libntp/recvbuff.c at 1.41 +15 -13
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - API cleanup: accept and silently ignore NULL pointer in 'freerecvbuf()'
         - fix SOCKET vs. FD clash
    
      ntpd/ntp_io.c at 1.400.4.1 +42 -12
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - first invalidate FDs in shared structure, then close handles
         - defer free() via cooling pond when doing overlapped IO 
        ---
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - proper wiring to IO completion ports
        ---
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - first invalidate FDs in shared structure, then close handles
         - defer free() via cooling pond when doing overlapped IO 
         - proper wiring to IO completion ports
        ---
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - wired the needed unregistration functions for overlapped IO
    
      ports/winnt/include/ntp_iocompletionport.h at 1.22 +17 -10
        Bug 3019 - NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - extend API to provide essential information
         - added missing unregistration functions to API
    
      ports/winnt/include/ntp_iocplmem.h at 1.1 +24 -0
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - refactored IOCPL heap into separate file
    
      ports/winnt/include/ntp_iocplmem.h at 1.0 +0 -0
    
      ports/winnt/include/ntp_iocpltypes.h at 1.1 +160 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - refactored helper objects (locks, PPS/device context, IO context,...) into separate file
    
      ports/winnt/include/ntp_iocpltypes.h at 1.0 +0 -0
    
      ports/winnt/ntpd/ntp_iocompletionport.c at 1.73 +875 -791
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - make sure ALL operations are overlapped for sockets
         - use APC queue for deferred error processing
         - take extra care to deal with interfaces/clocks being removed while overlapped IO in flight
         - minor WINAPI cleanups (VS2008 vs VS2013)
         - extend API to provide essential information
         - better context checking
         - implemented the missing unregistration functions
         - implemented shared locking between clocks/interfaces and IO operations
         - made sure minimal locking is engaged
         - fixed / locked / avoided access to global / shared values from IO thread
         - made sure interfaces and clocks cannot be deleted wile accessed from worker thread
         - made sure feeding the receive queue stops with deregistration
        In other words, a complete refurbishment.
         - further refactoring, better handling of received packets
    
      ports/winnt/ntpd/ntp_iocplmem.c at 1.1 +123 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - refactored IOCPL heap into separate file
    
      ports/winnt/ntpd/ntp_iocplmem.c at 1.0 +0 -0
    
      ports/winnt/ntpd/ntp_iocpltypes.c at 1.1 +366 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - refactored helper objects (locks, PPS/device context, IO context,...) into separate file
    
      ports/winnt/ntpd/ntp_iocpltypes.c at 1.0 +0 -0
    
      ports/winnt/ntpd/ntservice.c at 1.30 +13 -3
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - log request from SCM in INFO level
    
      ports/winnt/vs2005/ntpd.vcproj at 1.21 +8 -18
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - added ntp_iocpl{mem,types}.c to sources.
    
      ports/winnt/vs2008/ntpd/ntpd.vcproj at 1.51 +16 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - added ntp_iocpl{mem,types}.c to sources.
    
      ports/winnt/vs2013/debug-x64.props at 1.2 +1 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - sidekick: property sheet name
    
      ports/winnt/vs2013/libntp/libntp.vcxproj.filters at 1.7.1.1 +3 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - auto update
    
      ports/winnt/vs2013/ntpd/ntpd.vcxproj at 1.9 +4 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - added ntp_iocpl{mem,types}.c to sources.
    
      ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters at 1.6 +12 -0
        [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE
         - auto update
    
      ports/winnt/vs2013/release-x64.props at 1.2 +1 -0
        [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE
         - sidekick: property sheet name
    
    ChangeSet at 1.3265.1.382, 2016-03-23 06:26:31+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.13
    
      ChangeLog at 1.1593.1.216 +2 -2
        Merge cleanup
        MERGE: 1.1593.97.11
    
      ntpd/ntp_request.c at 1.120 +0 -0
        Auto merged
        MERGE: 1.117.1.1
    
    ChangeSet at 1.3265.140.13, 2016-03-23 05:33:34+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3010
      MERGE: 1.3265.146.2
    
      ChangeLog at 1.1593.97.11 +0 -0
        SCCS merged
        MERGE: 1.1593.103.2
    
      libntp/authreadkeys.c at 1.27 +0 -41
        Merge cleanup
        MERGE: 1.25.1.1
    
    ChangeSet at 1.3265.140.12, 2016-03-19 09:09:07+00:00, stenn at psp-deb1.ntp.org
      [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      tests/ntpq/Makefile.am at 1.9 +1 -0
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
    ChangeSet at 1.3265.1.380, 2016-03-16 09:32:24+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.11
    
      ChangeLog at 1.1593.1.215 +1 -1
        Merge cleanup
        MERGE: 1.1593.97.10
    
    ChangeSet at 1.3265.140.11, 2016-03-16 09:24:51+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3030
      MERGE: 1.3265.152.1
    
      ChangeLog at 1.1593.97.10 +1 -1
        merge cleanup
        MERGE: 1.1593.109.1
    
      ntpq/ntpq-subs.c at 1.118 +0 -0
        Auto merged
        MERGE: 1.116.1.1
    
    ChangeSet at 1.3265.140.10, 2016-03-16 09:22:31+00:00, stenn at psp-deb1.ntp.org
      Add README.pullrequests.  Harlan Stenn
    
      ChangeLog at 1.1593.97.9 +1 -0
        Add README.pullrequests.  Harlan Stenn
    
      Makefile.am at 1.135 +1 -0
        Add README.pullrequests.  Harlan Stenn
    
      README.pullrequests at 1.1 +90 -0
        BitKeeper file /home/stenn/ntp-stable/README.pullrequests
    
      README.pullrequests at 1.0 +0 -0
    
    ChangeSet at 1.3265.152.1, 2016-03-16 08:46:16+00:00, stenn at psp-deb1.ntp.org
      [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ChangeLog at 1.1593.109.1 +1 -0
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/invoke-ntpq.texi at 1.485.16.1 +28 -1
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq-opts.c at 1.502.16.1 +108 -50
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq-opts.def at 1.27 +12 -0
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq-opts.h at 1.500.16.1 +21 -8
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq-subs.c at 1.116.1.1 +17 -10
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.1ntpqman at 1.313.16.1 +24 -3
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.1ntpqmdoc at 1.313.16.1 +22 -2
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.c at 1.155.1.14 +53 -2
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.h at 1.32 +3 -0
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.man.in at 1.313.16.1 +24 -3
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
      ntpq/ntpq.mdoc.in at 1.313.16.1 +22 -2
        [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
    
    ChangeSet at 1.3265.1.379, 2016-03-14 10:26:26+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.9
    
      ChangeLog at 1.1593.1.214 +0 -0
        Auto merged
        MERGE: 1.1593.97.8
    
    ChangeSet at 1.3265.140.9, 2016-03-14 10:20:38+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3023
      MERGE: 1.3265.151.1
    
      ChangeLog at 1.1593.97.8 +1 -1
        Merge cleanup
        MERGE: 1.1593.108.1
    
    ChangeSet at 1.3265.1.378, 2016-03-14 10:10:21+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.8
    
      ChangeLog at 1.1593.1.213 +0 -0
        Auto merged
        MERGE: 1.1593.97.7
    
    ChangeSet at 1.3265.140.8, 2016-03-14 09:53:30+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3022
      MERGE: 1.3265.150.1
    
      ChangeLog at 1.1593.97.7 +4 -4
        Merge cleanup
        MERGE: 1.1593.107.1
    
    ChangeSet at 1.3265.151.1, 2016-03-01 08:30:22+01:00, perlinger at ntp.org
      [Bug 3023] ntpdate cannot correct dates in the future.
    
      ChangeLog at 1.1593.108.1 +1 -0
        [Bug 3023] ntpdate cannot correct dates in the future.
    
      ntpdate/ntpdate.c at 1.98 +9 -5
        [Bug 3023] ntpdate cannot correct dates in the future.
    
    ChangeSet at 1.3265.1.377, 2016-03-01 05:46:29+00:00, stenn at psp-deb1.ntp.org
      cleanup
    
      ChangeLog at 1.1593.1.212 +0 -1
        cleanup
    
    ChangeSet at 1.3265.1.376, 2016-02-29 23:01:01+00:00, stenn at psp-deb1.ntp.org
      [Sec 3020] Refclock impersonation.  HStenn.
    
      ChangeLog at 1.1593.1.211 +1 -0
        [Sec 3020] Refclock impersonation.  HStenn.
    
      configure.ac at 1.581.1.23 +18 -0
        [Sec 3020] Refclock impersonation.  HStenn.
    
      ntpd/ntp_io.c at 1.400.1.15 +12 -0
        [Sec 3020] Refclock impersonation.  HStenn.
    
    ChangeSet at 1.3265.150.1, 2016-02-29 20:03:59+01:00, jnperlin at hydra.localnet
      [Bug 3022] authkeys.c should be refactored
    
      ChangeLog at 1.1593.107.1 +4 -0
        [Bug 3022] authkeys.c should be refactored
    
      include/ntp_keyacc.h at 1.2 +6 -0
        [Bug 3022] authkeys.c should be refactored
         - refactoring of key access handling
    
      libntp/authkeys.c at 1.34 +146 -85
        [Bug 3022] authkeys.c should be refactored
         - refactoring of key access handling
         - fixed memory leak in access list
    
      libntp/authreadkeys.c at 1.25.1.1 +52 -44
        [Bug 3022] authkeys.c should be refactored
         - refactoring of key access handling
         - reduced number of error branches
    
    ChangeSet at 1.3265.1.375, 2016-02-22 06:37:40+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3008-harlan
      MERGE: 1.3265.148.6
    
      ChangeLog at 1.1593.1.210 +4 -4
        Merge cleanup
        MERGE: 1.1593.105.5
    
      ntpd/ntp_control.c at 1.209 +0 -11
        Auto merged
        MERGE: 1.206.1.1
    
    ChangeSet at 1.3265.148.6, 2016-02-22 05:37:02+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-3008
      MERGE: 1.3265.149.2
    
      ChangeLog at 1.1593.105.5 +0 -0
        Auto merged
        MERGE: 1.1593.106.1
    
      ntpd/ntp_control.c at 1.208 +0 -0
        Auto merged
        MERGE: 1.206.2.1
    
    ChangeSet at 1.3265.149.2, 2016-02-22 05:33:56+00:00, stenn at psp-deb1.ntp.org
      [Sec 3008] Always check the return value of ctl_getitem().  HStenn.
    
      ChangeLog at 1.1593.106.1 +1 -0
        [Sec 3008] Always check the return value of ctl_getitem().  HStenn.
    
      ntpd/ntp_control.c at 1.206.2.1 +11 -2
        [Sec 3008] Always check the return value of ctl_getitem().  HStenn.
    
    ChangeSet at 1.3265.149.1, 2016-02-22 05:12:39+00:00, stenn at psp-deb1.ntp.org
      Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.def at 1.23 +38 -16
        Update ntp.conf documentation.  Harlan Stenn.
    
    ChangeSet at 1.3265.148.5, 2016-02-22 04:15:03+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3011
      MERGE: 1.3265.143.1
    
      ChangeLog at 1.1593.105.4 +2 -2
        Merge cleanup
        MERGE: 1.1593.100.1
    
      ntpd/ntp_request.c at 1.119 +0 -0
        Auto merged
        MERGE: 1.117.2.1
    
    ChangeSet at 1.3265.148.4, 2016-02-22 04:03:13+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3009
      MERGE: 1.3265.147.1
    
      ChangeLog at 1.1593.105.3 +0 -0
        SCCS merged
        MERGE: 1.1593.104.1
    
    ChangeSet at 1.3265.148.3, 2016-02-22 03:39:39+00:00, stenn at psp-deb1.ntp.org
      Bug 3007 cleanup
    
      ntpd/ntp_proto.c at 1.379 +4 -1
        Bug 3007 cleanup
    
    ChangeSet at 1.3265.148.2, 2016-02-22 02:10:14+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      into  psp-deb1.ntp.org:/home/mayer/ntp-stable-Bug3007
      MERGE: 1.3265.141.3
    
      ChangeLog at 1.1593.105.2 +1 -1
        Merge cleanup
        MERGE: 1.1593.98.2
    
      ntpd/ntp_proto.c at 1.378 +0 -0
        Auto merged
        MERGE: 1.373.1.2
    
    ChangeSet at 1.3265.148.1, 2016-02-22 01:39:41+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.7
    
      ChangeLog at 1.1593.105.1 +2 -2
        Merge cleanup
        MERGE: 1.1593.97.6
    
    ChangeSet at 1.3265.140.7, 2016-02-22 01:33:21+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3015
      MERGE: 1.3265.144.1
    
      ChangeLog at 1.1593.97.6 +2 -2
        Merge cleanup
        MERGE: 1.1593.101.1
    
    ChangeSet at 1.3265.140.6, 2016-02-22 01:24:10+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3013
      MERGE: 1.3265.145.1
    
      ChangeLog at 1.1593.97.5 +0 -0
        SCCS merged
        MERGE: 1.1593.102.1
    
    ChangeSet at 1.3265.140.5, 2016-02-22 01:14:05+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2999
      MERGE: 1.3265.142.3
    
      ChangeLog at 1.1593.97.4 +1 -1
        Merge cleanup
        MERGE: 1.1593.99.3
    
    ChangeSet at 1.3265.147.1, 2016-02-21 15:09:37+01:00, perlinger at ntp.org
      [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error
    
      ChangeLog at 1.1593.104.1 +2 -0
        [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error
    
      ntpd/ntp_request.c at 1.117.2.1 +29 -2
        [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error
         - added more stringent checks on packet content:
           hmode <= 6 (7 is already out of range for a peer mode!)
    
    ChangeSet at 1.3265.146.2, 2016-02-21 09:39:25+01:00, perlinger at ntp.org
      Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
       - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed
    
      ChangeLog at 1.1593.103.2 +2 -0
        Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
         - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed
    
      libntp/authreadkeys.c at 1.26 +48 -26
        [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
         - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed
    
    ChangeSet at 1.3265.146.1, 2016-02-19 22:42:25+01:00, perlinger at ntp.org
      [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
    
      ChangeLog at 1.1593.103.1 +2 -0
        [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
    
      ntpd/ntp_request.c at 1.117.1.1 +41 -25
        [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated
         - make sure the new keyids are valid static key IDs and present in the key table
    
    ChangeSet at 1.3265.145.1, 2016-02-19 19:47:31+01:00, perlinger at ntp.org
      [Bug 3013] Fix for ssl_init.c SHA1 test
    
      ChangeLog at 1.1593.102.1 +2 -0
        [Bug 3013] Fix for ssl_init.c SHA1 test
    
      tests/libntp/ssl_init.c at 1.9 +2 -2
        [Bug 3013] Fix for ssl_init.c SHA1 test
         - Require SHA1 explicitely, to avoid confusion with (deprecated) SHA0.
           Patch provided by Ch. Weisgerber
    
    ChangeSet at 1.3265.144.1, 2016-02-17 18:36:10+01:00, perlinger at ntp.org
      [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
    
      ChangeLog at 1.1593.101.1 +3 -0
        [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
    
      ntpq/ntpq-subs.c at 1.117 +35 -16
        [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
         - remove trailing whitespace in remote config command
         - remove comments, too.
    
    ChangeSet at 1.3265.1.374, 2016-02-17 09:30:05+01:00, jnperlin at hydra.localnet
      [Bug 3008] ctl_getitem() return value not always checked
    
      ChangeLog at 1.1593.1.209 +3 -0
        [Bug 3008] ctl_getitem() return value not always checked
    
      ntpd/ntp_control.c at 1.206.1.1 +101 -58
        [Bug 3008] ctl_getitem() return value not always checked
         - also some cleanup of ctl_getitem
    
    ChangeSet at 1.3265.142.3, 2016-02-14 10:15:57+00:00, stenn at psp-deb1.ntp.org
      Fix typo in html/monopt.html.  Harlan Stenn.
    
      ChangeLog at 1.1593.99.3 +1 -0
        Fix typo in html/monopt.html.  Harlan Stenn.
    
      html/monopt.html at 1.39 +2 -2
        Fix typo in html/monopt.html.  Harlan Stenn.
    
    ChangeSet at 1.3265.142.2, 2016-02-13 09:15:45+00:00, stenn at psp-deb1.ntp.org
      Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
    
      ChangeLog at 1.1593.99.2 +1 -0
        Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
    
      NEWS at 1.130.1.31 +3 -2
        Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
    
    ChangeSet at 1.3265.143.1, 2016-02-10 20:11:21+01:00, perlinger at ntp.org
      [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch
    
      ChangeLog at 1.1593.100.1 +2 -0
        [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch
    
      ntpd/ntp_request.c at 1.118 +48 -78
        [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch
         - reworked 'do_unconf()' to survive the effect of having peers named multiple times
    
    ChangeSet at 1.3265.141.3, 2016-02-09 00:46:57+00:00, mayer at psp-deb1.ntp.org
      Allow Active and Passive peer for crypto-NAK and added reporting
    
      ntpd/ntp_proto.c at 1.373.1.2 +6 -2
        Allow Active and Passive peer for crypto-NAK and added reporting
    
    ChangeSet at 1.3265.1.373, 2016-02-07 07:35:03+00:00, stenn at psp-deb1.ntp.org
      Update ntp.conf documentation.  Harlan Stenn.
    
      ChangeLog at 1.1593.1.208 +1 -0
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/invoke-ntp.conf.texi at 1.168.20.1 +37 -10
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.5man at 1.202.20.1 +42 -12
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.5mdoc at 1.202.20.1 +38 -11
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.def at 1.22 +36 -9
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.man.in at 1.202.20.1 +42 -12
        Update ntp.conf documentation.  Harlan Stenn.
    
      ntpd/ntp.conf.mdoc.in at 1.202.20.1 +38 -11
        Update ntp.conf documentation.  Harlan Stenn.
    
    ChangeSet at 1.3265.1.372, 2016-02-06 07:39:44+00:00, stenn at psp-deb1.ntp.org
      Update html/xleave.html documentation.  Harlan Stenn.
    
      ChangeLog at 1.1593.1.207 +1 -0
        Update html/xleave.html documentation.  Harlan Stenn.
    
      html/xleave.html at 1.11 +6 -6
        Update html/xleave.html documentation.  Harlan Stenn.
    
    ChangeSet at 1.3265.141.2, 2016-02-05 10:50:33+00:00, stenn at psp-deb1.ntp.org
      cleanup
    
      ChangeLog at 1.1593.98.2 +1 -1
        cleanup
    
    ChangeSet at 1.3265.1.371, 2016-02-05 09:23:09+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.142.1
    
      ChangeLog at 1.1593.1.206 +0 -0
        Auto merged
        MERGE: 1.1593.99.1
    
    ChangeSet at 1.3265.142.1, 2016-02-05 09:21:00+00:00, stenn at psp-deb1.ntp.org
      Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
    
      ChangeLog at 1.1593.99.1 +1 -0
        Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
    
      html/authentic.html at 1.15 +16 -16
        Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
    
    ChangeSet at 1.3265.141.1, 2016-02-05 04:29:08+00:00, mayer at psp-deb1.ntp.org
      Validate crypto-NAK's
    
      ChangeLog at 1.1593.98.1 +1 -0
        Validate crypto-NAK's
    
      include/ntp.h at 1.217 +2 -0
        Add badNAM to peer struct and specify min V4 len
    
      ntpd/ntp_proto.c at 1.373.1.1 +78 -2
        Validate crypto-NAM's
    
    ChangeSet at 1.3265.140.4, 2016-01-28 08:08:42+01:00, jnperlin at hydra.localnet
      [Bug 2999] out-of-bounds access in 'is_safe_filename()'
    
      ChangeLog at 1.1593.97.3 +1 -0
        [Bug 2999] out-of-bounds access in 'is_safe_filename()'
    
      ntpd/ntp_control.c at 1.207 +3 -3
        [Bug 2999] out-of-bounds access in 'is_safe_filename()'
         - fixed array bound test
         - make function NULL-pointer safe
    
    ChangeSet at 1.3265.1.370, 2016-01-26 08:47:08+00:00, stenn at psp-deb1.ntp.org
      cleanup
    
      ntpd/ntp_proto.c at 1.377 +20 -18
        cleanup
    
    ChangeSet at 1.3265.1.369, 2016-01-24 10:18:39+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.3
    
      ChangeLog at 1.1593.1.205 +1 -1
        merge cleanup
        MERGE: 1.1593.97.2
    
    ChangeSet at 1.3265.1.368, 2016-01-24 02:03:48-08:00, harlan at nb7-a.pfcs.com
      Merge stenn at psp-deb1.ntp.org:ntp-stable-p7
      into  nb7-a.pfcs.com:/home/harlan/src/ntp-stable
      MERGE: 1.3265.138.1
    
      ChangeLog at 1.1593.1.204 +1 -4
        merge cleanup
        MERGE: 1.1593.95.1
    
    ChangeSet at 1.3265.1.367, 2016-01-24 06:22:51+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.140.2
    
      ChangeLog at 1.1593.1.203 +0 -3
        Auto merged
        MERGE: 1.1593.97.1
    
    ChangeSet at 1.3265.1.366, 2016-01-23 14:28:09+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/mayer/ntp-stable-Bug2995/
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7
      MERGE: 1.3265.137.7
    
      ChangeLog at 1.1593.1.202 +1 -1
        Merge cleanup
        MERGE: 1.1593.94.6
    
      ports/winnt/vs2008/libntp/libntp.vcproj at 1.56 +0 -0
        Auto merged
        MERGE: 1.54.1.1
    
      ports/winnt/vs2013/libntp/libntp.vcxproj at 1.11 +0 -0
        Auto merged
        MERGE: 1.9.1.1
    
    ChangeSet at 1.3265.137.7, 2016-01-23 14:26:48+00:00, stenn at psp-deb1.ntp.org
      Reclassify KoD timestamp checks to 2945
    
      ChangeLog at 1.1593.94.6 +1 -1
        Reclassify KoD timestamp checks to 2945
    
    ChangeSet at 1.3265.137.6, 2016-01-23 13:52:03+00:00, stenn at psp-deb1.ntp.org
      revert use of isc_tsmemcmp in sntp/crypto.c until it is in a more accessible place.  This is not a critical use of that function.
    
      sntp/crypto.c at 1.21 +8 -3
        revert use of isc_tsmemcmp in sntp/crypto.c until it is in a more accessible place.  This is not a critical use of that function.
    
    ChangeSet at 1.3265.137.5, 2016-01-23 12:54:39+00:00, stenn at psp-deb1.ntp.org
      [Sec 2901] Additional KoD packet checks.  HStenn.
    
      ChangeLog at 1.1593.94.5 +1 -0
        [Sec 2901] Additional KoD packet checks.  HStenn.
    
      ntpd/ntp_proto.c at 1.376 +53 -0
        [Sec 2901] Additional KoD packet checks.  HStenn.
    
    ChangeSet at 1.3265.137.4, 2016-01-23 11:36:37+00:00, stenn at psp-deb1.ntp.org
      [Sec 2901] KoD packets must have non-zero transmit timestamps.  HStenn.
    
      ChangeLog at 1.1593.94.4 +1 -0
        [Sec 2901] KoD packets must have non-zero transmit timestamps.  HStenn.
    
      ntpd/ntp_proto.c at 1.375 +10 -0
        [Sec 2901] KoD packets must have non-zero transmit timestamps.  HStenn.
    
    ChangeSet at 1.3265.137.3, 2016-01-23 10:34:17+00:00, stenn at psp-deb1.ntp.org
      [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve time. Include passive servers in this check. HStenn.
    
      ChangeLog at 1.1593.94.3 +2 -0
        [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve time. Include passive servers in this check. HStenn.
    
      ntpd/ntp_proto.c at 1.374 +1 -1
        [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve time. Include passive servers in this check. HStenn.
    
    ChangeSet at 1.3265.138.1, 2016-01-21 00:47:12-08:00, harlan at nb7-a.pfcs.com
      [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      ChangeLog at 1.1593.95.1 +4 -0
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      configure.ac at 1.581.1.22 +3 -1
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      include/ntp_types.h at 1.37 +7 -0
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      tests/libntp/lfpfunc.c at 1.16 +0 -3
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      tests/libntp/run-lfpfunc.c at 1.19 +9 -9
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      tests/libntp/run-timevalops.c at 1.14 +28 -28
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      tests/libntp/timespecops.c at 1.11 +0 -2
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
      tests/libntp/timevalops.c at 1.14 +0 -2
        [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
    
    ChangeSet at 1.3265.137.2, 2016-01-21 07:35:48+00:00, stenn at psp-deb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1593.94.2 +7 -3
        merge cleanup
    
    ChangeSet at 1.3265.137.1, 2016-01-21 06:40:56+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2879
      into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p6
      MERGE: 1.3265.127.1
    
      ChangeLog at 1.1593.94.1 +0 -0
        Auto merged
        MERGE: 1.1593.84.1
    
      libntp/Makefile.am at 1.78 +0 -0
        Auto merged
        MERGE: 1.76.1.1
    
      sntp/crypto.c at 1.20 +0 -1
        Merge cleanup
        MERGE: 1.18.1.1
    
    ChangeSet at 1.3265.127.1, 2015-12-12 10:24:19+00:00, perlinger at psp-deb1.ntp.org
      [Bug 2879] Improve NTP security against timing attacks.
       - use timing-safe memcmp() for digest tests
    
      ChangeLog at 1.1593.84.1 +3 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - use timing-safe memcmp() for digest test
    
      lib/isc/hmacmd5.c at 1.3 +1 -1
        [Bug 2879] Improve NTP security against timing attacks.
         - use timing-safe memcmp() for digest tests
    
      lib/isc/hmacsha.c at 1.3 +5 -5
        [Bug 2879] Improve NTP security against timing attacks.
         - use timing-safe memcmp() for digest tests
    
      lib/isc/include/isc/string.h at 1.5 +18 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - prototype for timing-safe 'isc_tsmemcmp()'
    
      lib/isc/tsmemcmp.c at 1.1 +55 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - implement a timing safe (though less efficient) version of 'memcmp()'
           as 'isc_tsmemcmp()'
    
      lib/isc/tsmemcmp.c at 1.0 +0 -0
    
      libntp/Makefile.am at 1.77 +1 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - add new source file 'lib/isc/tsmemcmp.c'
    
      libntp/a_md5encrypt.c at 1.36 +2 -2
        [Bug 2879] Improve NTP security against timing attacks.
         - use timing-safe memcmp() for digest tests
    
      ports/winnt/vs2005/libntp.vcproj at 1.25 +4 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - add new source file 'lib/isc/tsmemcmp.c'
    
      ports/winnt/vs2008/libntp/libntp.vcproj at 1.55 +4 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - add new source file 'lib/isc/tsmemcmp.c'
    
      ports/winnt/vs2013/libntp/libntp.vcxproj at 1.10 +3 -2
        [Bug 2879] Improve NTP security against timing attacks.
         - add new source file 'lib/isc/tsmemcmp.c'
    
      ports/winnt/vs2013/libntp/libntp.vcxproj.filters at 1.8 +5 -2
        [Bug 2879] Improve NTP security against timing attacks.
         - add new source file 'lib/isc/tsmemcmp.c'
    
      sntp/crypto.c at 1.19 +2 -1
        [Bug 2879] Improve NTP security against timing attacks.
         - use timing-safe memcmp() for digest tests
    
      tests/libntp/Makefile.am at 1.94 +12 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - add unit test for timing-safe memcmp
    
      tests/libntp/run-tsafememcmp.c at 1.1 +64 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - auto-generated test runner
    
      tests/libntp/run-tsafememcmp.c at 1.0 +0 -0
    
      tests/libntp/tsafememcmp.c at 1.1 +85 -0
        [Bug 2879] Improve NTP security against timing attacks.
         - unit tests for timing-safe memcmp
    
      tests/libntp/tsafememcmp.c at 1.0 +0 -0
    


More information about the commitlogs mailing list