<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Hal Murray pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/cde545b98cd50ddc581c09e4d45a27960398359d">cde545b9</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-12-25T02:38:55-08:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Fix bug in reference time for mru printouts
It was using the local start time rather than
the end of collection time returned by the server.
That gave negative lstint and maybe other strange printouts.
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#f02a16b09a60cd9a00ca251063355e22152519dc" style="text-decoration: none">
ntpclients/ntpq
</a>
</li>
<li class="file-stats">
<a href="#a61fb9541c7ffe95e3b809ea55001114580d13e4" style="text-decoration: none">
pylib/util.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="f02a16b09a60cd9a00ca251063355e22152519dc">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/cde545b98cd50ddc581c09e4d45a27960398359d#f02a16b09a60cd9a00ca251063355e22152519dc"><strong>ntpclients/ntpq</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1232" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1232" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -1232,6 +1232,7 @@ usage: config_from_file <configuration filename></td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1232" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1232
</td>
<td class="diff-line-num new_line" data-linenumber="1232" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1232
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1232" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">say</span><span class="p">((</span><span class="s" style="color: #d14">"="</span> <span class="o" style="font-weight: bold">*</span> <span class="n" style="color: #333">ntp</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">util</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">MRUSummary</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">width</span><span class="p">)</span> <span class="o" style="font-weight: bold">+</span> <span class="s" style="color: #d14">"</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1233" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1233
</td>
<td class="diff-line-num new_line" data-linenumber="1233" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1233
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1233" class="line"> <span class="c" style="color: #998; font-style: italic"># reversed puts most recent entries at the top if no sort=</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1234" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1234
</td>
<td class="diff-line-num new_line" data-linenumber="1234" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1234
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1234" class="line"> <span class="c" style="color: #998; font-style: italic"># see sort comments in pylib/packet.py</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1235" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1235" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1235
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1235" class="line"> <span class="n" style="color: #333">formatter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">now</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">span</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">now</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1235" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1235
</td>
<td class="diff-line-num new_line" data-linenumber="1236" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1236
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1236" class="line"> <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">entry</span> <span class="ow" style="font-weight: bold">in</span> <span class="nb" style="color: #0086b3">reversed</span><span class="p">(</span><span class="n" style="color: #333">span</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">entries</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1236" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1236
</td>
<td class="diff-line-num new_line" data-linenumber="1237" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1237
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1237" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">say</span><span class="p">(</span><span class="n" style="color: #333">formatter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">summary</span><span class="p">(</span><span class="n" style="color: #333">entry</span><span class="p">)</span> <span class="o" style="font-weight: bold">+</span> <span class="s" style="color: #d14">"</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1237" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1237
</td>
<td class="diff-line-num new_line" data-linenumber="1238" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1238
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1238" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">say</span><span class="p">(</span><span class="s" style="color: #d14">"# Collected </span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">d slots in </span><span class="si" style="color: #d14">%.3</span><span class="s" style="color: #d14">f seconds</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span> \</span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="a61fb9541c7ffe95e3b809ea55001114580d13e4">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/cde545b98cd50ddc581c09e4d45a27960398359d#a61fb9541c7ffe95e3b809ea55001114580d13e4"><strong>pylib/util.py</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="475" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="475" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -475,7 +475,7 @@ class MRUSummary:</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="475" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
475
</td>
<td class="diff-line-num new_line" data-linenumber="475" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
475
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC475" class="line"> <span class="s" style="color: #d14">"Reusable class for MRU entry summary generation."</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="476" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
476
</td>
<td class="diff-line-num new_line" data-linenumber="476" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
476
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC476" class="line"> <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">__init__</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">,</span> <span class="n" style="color: #333">showhostnames</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="477" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
477
</td>
<td class="diff-line-num new_line" data-linenumber="477" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
477
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC477" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">showhostnames</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">showhostnames</span> <span class="c" style="color: #998; font-style: italic"># If false, display numeric IPs</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="478" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
478
</td>
<td class="diff-line-num new_line old" data-linenumber="478" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC478" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">now</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333"><span class="idiff left">time</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">time</span></span><span class="p"><span class="idiff right">()</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="479" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="478" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
478
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC478" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">now</span> <span class="o" style="font-weight: bold">=</span> <span class="bp" style="color: #999"><span class="idiff left right">None</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
479
</td>
<td class="diff-line-num new_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
479
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC479" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">logfp</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stderr</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="480" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
480
</td>
<td class="diff-line-num new_line" data-linenumber="480" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
480
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC480" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">debug</span> <span class="o" style="font-weight: bold">=</span> <span class="mi" style="color: #099">0</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
481
</td>
<td class="diff-line-num new_line" data-linenumber="481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
481
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC481" class="line"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/cde545b98cd50ddc581c09e4d45a27960398359d">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/cde545b98cd50ddc581c09e4d45a27960398359d"}}</script>
</p>
</div>
</body>
</html>