drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tshi...@apache.org
Subject [29/30] drill git commit: Merge commit '38c3cb4f8051cd6896d2117a2edeb10e08200109' into gh-pages
Date Mon, 23 Nov 2015 21:54:12 GMT
Merge commit '38c3cb4f8051cd6896d2117a2edeb10e08200109' into gh-pages

Conflicts:
	_docs/connect-a-data-source/035-plugin-configuration-basics.md


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/471762cf
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/471762cf
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/471762cf

Branch: refs/heads/gh-pages
Commit: 471762cf75dd3ffb043cdf4676439e0f0c536102
Parents: 9ccc3bf 38c3cb4
Author: Tomer Shiran <tshiran@gmail.com>
Authored: Mon Nov 23 10:46:30 2015 -0800
Committer: Tomer Shiran <tshiran@gmail.com>
Committed: Mon Nov 23 10:46:30 2015 -0800

----------------------------------------------------------------------
 _data/docs.json                                 | 142 +++++-
 .../035-plugin-configuration-basics.md          |  10 +-
 .../025-tutorial-develop-a-simple-function.md   |   6 +-
 _docs/developer-information/009-rest-api.md     | 480 +++++++++++++++++++
 _docs/rn/008-1.3.0-rn.md                        | 159 ++++++
 5 files changed, 769 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/471762cf/_data/docs.json
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/drill/blob/471762cf/_docs/connect-a-data-source/035-plugin-configuration-basics.md
----------------------------------------------------------------------
diff --cc _docs/connect-a-data-source/035-plugin-configuration-basics.md
index 5788bc3,e8b5d22..f4cc268
--- a/_docs/connect-a-data-source/035-plugin-configuration-basics.md
+++ b/_docs/connect-a-data-source/035-plugin-configuration-basics.md
@@@ -84,8 -84,8 +84,8 @@@ The following table describes the attri
    </tr>
    <tr>
      <td>"formats"</td>
-     <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb"<br>"sequencefile"
*</td>
-     <td>yes</td>
 -    <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb"
*</td>
++<td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb"<br>"sequencefile"
*</td>
+     <td>yes if type is file</td>
      <td>One or more valid file formats for reading. Drill implicitly detects formats
of some files based on extension or bits of data in the file; others require configuration.</td>
    </tr>
    <tr>
@@@ -159,7 -152,7 +159,7 @@@ For example, using uppercase letters i
  
  ## Storage Plugin REST API
  
- If you need to add a storage plugin configuration to Drill and do not want to use a web
browser, Drill provides a REST API that you can use to create a storage plugin configuration.
Use a POST and pass two properties:
 -If you need to add a storage plugin configuration to Drill and do not want to use a web
browser, you can use the [Drill REST API]({{site.baseurl}}/docs/rest-api/#get-status-threads)
to create a storage plugin configuration. Use a POST request and pass two properties:
++If you need to add a storage plugin configuration to Drill and do not want to use a web
browser, you can use the [Drill REST API]({{site.baseurl}}/docs/rest-api/) to create a storage
plugin configuration. Use a POST request and pass two properties:
  
  * name  
    The storage plugin configuration name. 


Mime
View raw message