<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/mtlynch/mlab-observatory master</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/mlab-observatory/pull/37'>https://github.com/opentechinstitute/mlab-observatory/pull/37</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Adding TelescopeConverter, the class that pulls together all subcomponents to convert Telescope data to Observatory data.</li>
  <li>Removing stray temp files from test data.</li>
  <li>Merge branch 'master' of https://github.com/opentechinstitute/mlab-observatory</li>
  <li>Removing stray newline.</li>
  <li>Merge branch 'master' of https://github.com/opentechinstitute/mlab-observatory</li>
  <li>Merge branch 'master' of https://github.com/opentechinstitute/mlab-observatory</li>
  <li>Fixing some style issues.</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-0">convert_from_telescope/convert.py</a>
    (203)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-1">convert_from_telescope/convert_e2e_test.py</a>
    (139)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-2">convert_from_telescope/sample_checking.py</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-3">convert_from_telescope/telescope_convert.py</a>
    (141)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-4">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_att_average_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-5">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_att_download_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-6">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_att_minimum_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-7">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_att_packet_retransmit_rate-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-8">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_att_upload_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-9">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_comcast_average_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-10">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_comcast_download_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-11">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_comcast_minimum_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-12">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_comcast_packet_retransmit_rate-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-13">convert_from_telescope/testdata/2012-01-01-000000+365d_lga01_comcast_upload_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-14">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq01_att_average_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-15">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq01_att_download_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-16">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq01_att_minimum_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-17">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq01_att_packet_retransmit_rate-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-18">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq01_att_upload_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-19">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq02_att_average_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-20">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq02_att_download_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-21">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq02_att_minimum_rtt-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-22">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq02_att_packet_retransmit_rate-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-23">convert_from_telescope/testdata/2012-01-01-000000+365d_nuq02_att_upload_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-24">convert_from_telescope/testdata/2014-10-01-000000+47d_nuq02_att_download_throughput-raw.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-25">convert_from_telescope/testoutput-golden/compareData/LGA_att_daily.csv</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-26">convert_from_telescope/testoutput-golden/compareData/LGA_att_hourly.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-27">convert_from_telescope/testoutput-golden/compareData/LGA_comcast_daily.csv</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-28">convert_from_telescope/testoutput-golden/compareData/LGA_comcast_hourly.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-29">convert_from_telescope/testoutput-golden/compareData/NUQ_att_daily.csv</a>
    (7)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-30">convert_from_telescope/testoutput-golden/compareData/NUQ_att_hourly.csv</a>
    (10)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-31">convert_from_telescope/testoutput-golden/exploreData/lga01_att_daily.csv</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-32">convert_from_telescope/testoutput-golden/exploreData/lga01_att_hourly.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-33">convert_from_telescope/testoutput-golden/exploreData/lga01_comcast_daily.csv</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-34">convert_from_telescope/testoutput-golden/exploreData/lga01_comcast_hourly.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-35">convert_from_telescope/testoutput-golden/exploreData/nuq01_att_daily.csv</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-36">convert_from_telescope/testoutput-golden/exploreData/nuq01_att_hourly.csv</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-37">convert_from_telescope/testoutput-golden/exploreData/nuq02_att_daily.csv</a>
    (7)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-38">convert_from_telescope/testoutput-golden/exploreData/nuq02_att_hourly.csv</a>
    (10)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-39">convert_from_telescope/testoutput-golden/metadata/validCompareKeys.txt</a>
    (3)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37/files#diff-40">convert_from_telescope/testoutput-golden/metadata/validExploreKeys.txt</a>
    (4)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/mlab-observatory/pull/37.patch'>https://github.com/opentechinstitute/mlab-observatory/pull/37.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/mlab-observatory/pull/37.diff'>https://github.com/opentechinstitute/mlab-observatory/pull/37.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/opentechinstitute/mlab-observatory/pull/37">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AC7qBEX-pb5bR62kt6Z4QfjOoKxgRqv2ks5nfqMlgaJpZM4DP7kG.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
  <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
    <link itemprop="url" href="https://github.com/opentechinstitute/mlab-observatory/pull/37"></link>
    <meta itemprop="name" content="View Pull Request"></meta>
  </div>
  <meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>