<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">TakumiSakamoto <t.sak****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2016-08-01 19:41:51 +0900 (Mon, 01 Aug 2016)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2">0769a5c426a4ca9e2cf6cac005798567efe62fc2</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged <a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/ed1f61d">ed1f61d</a>: Merge pull request <a href="https://github.com/groonga/grafana-datasource-plugin-groonga/issues/2">#2</a> from TakumiSakamoto/develop</li>
</ul>
</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Adjust plugin.json to version 3</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4">plugin.json</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: plugin.json (+3 -4)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L1">1</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L2">2</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L3">3</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L4">4</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L5">5</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L6">6</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L7">7</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L8">8</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L9">9</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L10">10</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L11">11</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4L12">12</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R1">1</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R2">2</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R3">3</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R7">7</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R8">8</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R9">9</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R10">10</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/grafana-datasource-plugin-groonga/commit/0769a5c426a4ca9e2cf6cac005798567efe62fc2#diff-b3568fa08e53a00f66841ed9ca2c53d4R11">11</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1,12 +1,11 @@</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- "<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">pluginT</span>ype": "datasource",</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">t</span>ype": "datasource",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "name": "Groonga",</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- "type": "groonga",</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- "serviceName": "GroongaDatasource",</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "id": "groonga",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "module": "app/plugins/datasource/groonga/datasource",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "metrics": true,</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ "annotations": false,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "partials": {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "config": "app/plugins/datasource/groonga/partials/config.html"</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>