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

Harlan Stenn stenn at deacon.udel.edu
Thu Dec 1 04:56:12 UTC 2011


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-deb1.ntp.org    
ROOT      /deacon/backroom/ntp-dev/home/hart/ntp-dev-2050-59-66-68-69
LEVEL     1                   1                   
TIME_T    1313182656          1313182656          
UTC       20110812205736      20110812205736      
VERSION   bk-5.3              bk-5.3              

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2711, 2011-11-30 04:00:32+00:00, davehart at shiny.ad.hartbrothers.com
      Floor calculation of sys_rootdisp at sys_mindisp in clock_update (from
        Dave Mills).
    
      ChangeLog at 1.1063 +2 -0
        Floor calculation of sys_rootdisp at sys_mindisp in clock_update (from
          Dave Mills).
    
      ntpd/ntp_proto.c at 1.332 +6 -3
        Floor calculation of sys_rootdisp at sys_mindisp in clock_update (from
          Dave Mills).
    
    ChangeSet at 1.2710, 2011-11-29 22:08:30+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2050-59-66-68-69
      MERGE: 1.2082.4.249
    
      ChangeLog at 1.1062 +2 -3
        Routine from -stable
        MERGE: 1.496.26.178
    
      ntpd/ntp_crypto.c at 1.160 +0 -0
        Auto merged
        MERGE: 1.146.1.1
    
      ntpd/ntp_proto.c at 1.331 +5 -4
        restore -dev specific commented code in merge
        MERGE: 1.297.2.7
    
    ChangeSet at 1.2709, 2011-11-29 21:58:49+00:00, davehart at shiny.ad.hartbrothers.com
      [Bug 2073] Correct ntpq billboard's MODE_PASSIVE t from 'u' to 'S'.
      Round l_fp traffic interval when converting to integer in rate limit
        and KoD calculation.
    
      ChangeLog at 1.1061 +4 -1
        [Bug 2073] Correct ntpq billboard's MODE_PASSIVE t from 'u' to 'S'.
        Round l_fp traffic interval when converting to integer in rate limit
          and KoD calculation.
    
      include/ntp.h at 1.201 +1 -1
        MDF_UCLNT indicates preemptible, not ephemeral (comment fix).
    
      ntpd/ntp_monitor.c at 1.40 +5 -1
        Round l_fp traffic interval when converting to integer in rate limit
          and KoD calculation.
    
      ntpd/ntp_peer.c at 1.151 +20 -2
        provide debug trace output of newpeer()/findexistingpeer() search
          for duplicate associations.
    
      ntpd/ntp_proto.c at 1.330 +12 -10
        Avoid duplicate "no servers found".
    
      ntpq/ntpq-subs.c at 1.95 +6 -2
        [Bug 2073] Correct ntpq billboard's MODE_PASSIVE t from 'u' to 'S'.
    
    ChangeSet at 1.2082.4.249, 2011-11-29 13:35:16+00:00, davehart at shiny.ad.hartbrothers.com
      merge cleanup
    
      ChangeLog at 1.496.26.178 +0 -1
        merge cleanup
    
    ChangeSet at 1.2082.4.248, 2011-11-29 13:34:00+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2059-66-68-69
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      MERGE: 1.2082.47.2
    
      ChangeLog at 1.496.26.177 +0 -0
        Auto merged
        MERGE: 1.496.61.2
    
      ntpd/ntp_proto.c at 1.297.2.7 +0 -0
        Auto merged
        MERGE: 1.297.3.2
    
    ChangeSet at 1.2082.47.2, 2011-11-29 13:33:26+00:00, davehart at shiny.ad.hartbrothers.com
      Never send KoD rate limiting response to MODE_SERVER response.
    
      ChangeLog at 1.496.61.2 +3 -1
        Never send KoD rate limiting response to MODE_SERVER response.
    
      ntpd/ntp_crypto.c at 1.146.1.1 +1 -1
        Use () to enforce intended precendence of & and && operators
    
      ntpd/ntp_proto.c at 1.297.3.2 +3 -3
        Never send KoD rate limiting response to MODE_SERVER response.
    
    ChangeSet at 1.2708, 2011-11-27 00:52:01+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2050-59-66-68-69
      MERGE: 1.2082.4.247
    
      ChangeLog at 1.1060 +3 -1
        routine
        MERGE: 1.496.26.176
    
      libntp/a_md5encrypt.c at 1.31 +0 -0
        Auto merged
        MERGE: 1.26.1.2
    
      ntpd/ntp_proto.c at 1.329 +4 -7
        also respect orphanwait in orphan parent selection
        MERGE: 1.297.2.6
    
    ChangeSet at 1.2082.4.247, 2011-11-27 00:41:17+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      MERGE: 1.2082.48.2
    
      ChangeLog at 1.496.26.176 +1 -1
        routine
        MERGE: 1.496.62.1
    
      ntpd/ntp_proto.c at 1.297.2.6 +0 -0
        Auto merged
        MERGE: 1.297.4.1
    
    ChangeSet at 1.2082.48.2, 2011-11-27 00:39:11+00:00, davehart at shiny.ad.hartbrothers.com
      [Bug 2072] Orphan parent selection metric needs ntohl().
    
      ChangeLog at 1.496.62.1 +1 -0
        [Bug 2072] Orphan parent selection metric needs ntohl().
    
      libntp/a_md5encrypt.c at 1.26.1.2 +1 -0
        [Bug 2072] Orphan parent selection metric needs ntohl().
    
      ntpd/ntp_proto.c at 1.297.4.1 +3 -3
        [Bug 2072] Orphan parent selection metric needs ntohl().
    
    ChangeSet at 1.2707, 2011-11-26 23:06:48+00:00, davehart at shiny.ad.hartbrothers.com
      more merge cleanup
    
      include/lib_strbuf.h at 1.11 +4 -0
        guard against multiple inclusion (more merge cleanup)
    
      include/ntp_fp.h at 1.26 +1 -1
        more merge cleanup
    
      include/ntp_types.h at 1.30 +11 -11
        more merge cleanup
    
    ChangeSet at 1.2706, 2011-11-26 20:06:46+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2050-59-66-68-69
      MERGE: 1.2082.4.246
    
      include/ntp_types.h at 1.29 +10 -12
        somewhat wriggly merge
        MERGE: 1.14.1.3
    
    ChangeSet at 1.2082.48.1, 2011-11-26 19:43:12+00:00, davehart at shiny.ad.hartbrothers.com
      Avoid redefinition warnings for INT32_MIN, INT32_MAX, U_INT32_MAX.
    
      include/ntp_types.h at 1.14.1.3 +18 -6
        Avoid redefinition warnings for INT32_MIN, INT32_MAX, U_INT32_MAX.
    
    ChangeSet at 1.2705, 2011-11-26 12:50:07+00:00, davehart at shiny.ad.hartbrothers.com
      Restore 4.2.6 clock_combine() weighting to ntp-dev, reverting
       to pre-4.2.7p70 logic and avoiding divide-by-zero (from Dave Mills).
    
      ChangeLog at 1.1059 +3 -1
        Restore 4.2.6 clock_combine() weighting to ntp-dev, reverting
         to pre-4.2.7p70 logic and avoiding divide-by-zero (from Dave Mills).
    
      ntpd/ntp_proto.c at 1.328 +5 -5
        Restore 4.2.6 clock_combine() weighting to ntp-dev, reverting
         to pre-4.2.7p70 logic and avoiding divide-by-zero (from Dave Mills).
    
    ChangeSet at 1.2704, 2011-11-26 12:11:56+00:00, davehart at shiny.ad.hartbrothers.com
      merge cleanup
    
      ntpd/ntp_control.c at 1.176 +6 -6
        merge cleanup
    
      ntpd/ntp_io.c at 1.363 +0 -11
        merge cleanup
    
      ntpd/ntp_peer.c at 1.150 +6 -4
        merge cleanup
    
      ntpd/ntp_proto.c at 1.327 +1 -1
        merge cleanup
    
      ntpq/ntpq-subs.c at 1.94 +28 -18
        merge cleanup
    
      ntpq/ntpq.c at 1.143 +3 -3
        merge cleanup
    
      ntpq/ntpq.h at 1.26 +2 -2
        merge cleanup
    
    ChangeSet at 1.2703, 2011-11-26 10:14:46+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2050-59-66-68-69
      MERGE: 1.2082.4.245
    
      ChangeLog at 1.1058 +21 -11
        This nearly-correct merge will need followup cleanup cset, as this
          was a particularly gnarly merge from -stable due to conflicting
          -dev changes, especially for ntp_peer.c.
        MERGE: 1.496.26.175
    
      include/ntp.h at 1.200 +0 -0
        Auto merged
        MERGE: 1.168.1.7
    
      include/ntp_refclock.h at 1.33 +0 -0
        Auto merged
        MERGE: 1.24.1.2
    
      include/ntp_request.h at 1.45 +0 -0
        Auto merged
        MERGE: 1.40.1.1
    
      include/ntp_types.h at 1.28 +7 -4
        merge addition of INT32_MIN, INT32_MAX, U_INT32_MAX from -stable.
        MERGE: 1.14.1.2
    
      include/ntpd.h at 1.170 +2 -6
        routine
        MERGE: 1.137.2.7
    
      ntpd/ntp_config.c at 1.295 +2 -3
        easy
        MERGE: 1.241.1.10
    
      ntpd/ntp_control.c at 1.175 +6 -16
        straightfoward
        MERGE: 1.129.1.7
    
      ntpd/ntp_io.c at 1.362 +0 -0
        Auto merged
        MERGE: 1.306.1.17
    
      ntpd/ntp_peer.c at 1.149 +13 -24
        Hairy -- both -stable and -dev added a different new parameter to
          findexistingpeer() relative to the common ancestor.
        MERGE: 1.126.1.4
    
      ntpd/ntp_proto.c at 1.326 +37 -48
        straightforward
        MERGE: 1.297.2.5
    
      ntpd/ntp_refclock.c at 1.110 +2 -4
        more findexistingpeer() fallout, easy
        MERGE: 1.92.1.3
    
      ntpd/ntp_request.c at 1.108 +13 -23
        beat the findexistingpeer() drum quickly now
        MERGE: 1.82.1.6
    
      ntpd/ntp_timer.c at 1.66 +0 -0
        Auto merged
        MERGE: 1.56.1.1
    
      ntpq/ntpq-subs.c at 1.93 +12 -15
        slightly wrinkled by -dev previously having one nntohost() variant
          added relative to -stable, with this work adding a different variant
          to -stable and now -dev..
        MERGE: 1.39.2.6
    
      ntpq/ntpq.c at 1.142 +8 -8
        routine
        MERGE: 1.97.1.10
    
      ntpq/ntpq.h at 1.25 +2 -2
        routine
        MERGE: 1.10.1.5
    
    ChangeSet at 1.2082.4.245, 2011-11-25 10:25:49+00:00, davehart at shiny.ad.hartbrothers.com
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69
      MERGE: 1.2082.47.1
    
      ChangeLog at 1.496.26.175 +1 -3
        routine
        MERGE: 1.496.61.1
    
      ntpd/ntp_proto.c at 1.297.2.5 +0 -0
        Auto merged
        MERGE: 1.297.3.1
    
    ChangeSet at 1.2082.47.1, 2011-11-25 10:23:58+00:00, davehart at shiny.ad.hartbrothers.com
      [Bug 2059] optional billboard column "server" does not honor -n.
      [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
      [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
      [Bug 2069] broadcastclient, multicastclient spin up duplicate
        ephemeral associations without broadcastdelay.
      Exclude not-yet-determined sys_refid from use in loopback TEST12
        (from David Mills).
    
      ChangeLog at 1.496.61.1 +9 -0
        [Bug 2059] optional billboard column "server" does not honor -n.
        [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
        [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
        Exclude not-yet-determined sys_refid from use in loopback TEST12
          (from David Mills).
    
      include/ntp.h at 1.168.1.7 +1 -0
        Add peer flag FLAG_BC_VOL indicating the broadcastclient delay
          calibration is still in progress.
    
      include/ntp_refclock.h at 1.24.1.2 +1 -1
        [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
    
      include/ntp_request.h at 1.40.1.1 +2 -2
        [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
    
      include/ntpd.h at 1.137.2.7 +3 -1
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
        backport latoa() -> localaddrtoa(endpt *) from 4.2.7
    
      ntpd/ntp_config.c at 1.241.1.10 +1 -1
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
    
      ntpd/ntp_control.c at 1.129.1.7 +50 -37
        [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
    
      ntpd/ntp_io.c at 1.306.1.17 +11 -0
        backport latoa() -> localaddrtoa(endpt *) from 4.2.7
    
      ntpd/ntp_peer.c at 1.126.1.4 +40 -21
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
    
      ntpd/ntp_proto.c at 1.297.3.1 +53 -14
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
        Exclude not-yet-determined sys_refid from use in loopback TEST12
          (from David Mills).
    
      ntpd/ntp_refclock.c at 1.92.1.3 +2 -2
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
    
      ntpd/ntp_request.c at 1.82.1.6 +13 -11
        [Bug 2069] broadcastclient, multicastclient spin up duplicate
          ephemeral associations without broadcastdelay.
    
      ntpq/ntpq-subs.c at 1.39.2.6 +42 -22
        [Bug 2059] optional billboard column "server" does not honor -n.
        [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
    
      ntpq/ntpq.c at 1.97.1.10 +94 -9
        [Bug 2059] optional billboard column "server" does not honor -n.
    
      ntpq/ntpq.h at 1.10.1.5 +4 -0
        [Bug 2059] optional billboard column "server" does not honor -n.
        [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
    
    ChangeSet at 1.2082.4.244, 2011-11-21 09:35:28+00:00, davehart at shiny.ad.hartbrothers.com
      [Bug 2050] Orphan mode stratum counting to infinity.
    
      ChangeLog at 1.496.26.174 +4 -0
        [Bug 2050] Orphan mode stratum counting to infinity.
    
      include/ntp_types.h at 1.14.1.2 +6 -0
        [Bug 2050] Orphan mode stratum counting to infinity.
    
      ntpd/ntp_proto.c at 1.297.2.4 +31 -8
        [Bug 2050] Orphan mode stratum counting to infinity.
    
      ntpd/ntp_timer.c at 1.56.1.1 +2 -2
        [Bug 2050] Orphan mode stratum counting to infinity.
    


More information about the commitlogs mailing list