drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [31/31] drill git commit: Merge remote-tracking branch 'remotes/apache/gh-pages' into gh-pages
Date Wed, 25 Nov 2015 22:03:19 GMT
Merge remote-tracking branch 'remotes/apache/gh-pages' into gh-pages

Conflicts:
	_docs/connect-a-data-source/035-plugin-configuration-basics.md
	_docs/connect-a-data-source/plugins/080-rdbms-storage-plugin.md
	_docs/sql-reference/sql-commands/035-partition-by-clause.md


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

Branch: refs/heads/gh-pages
Commit: 212bc621aa417c581b7720096f9e5b4bf1ce2700
Parents: 1ae0e4e 434de0b
Author: Bridget Bevens <bbevens@maprtech.com>
Authored: Wed Nov 25 13:58:45 2015 -0800
Committer: Bridget Bevens <bbevens@maprtech.com>
Committed: Wed Nov 25 13:58:45 2015 -0800

----------------------------------------------------------------------
 .../035-plugin-configuration-basics.md                    |  9 +++++++++
 .../plugins/080-rdbms-storage-plugin.md                   |  3 +--
 _docs/performance-tuning/020-partition-pruning.md         |  9 ---------
 .../sql-reference/sql-commands/035-partition-by-clause.md | 10 +++-------
 4 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/212bc621/_docs/connect-a-data-source/035-plugin-configuration-basics.md
----------------------------------------------------------------------
diff --cc _docs/connect-a-data-source/035-plugin-configuration-basics.md
index fe77cb5,f4cc268..9cbb195
--- 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,13 @@@ The following table describes the attri
    </tr>
    <tr>
      <td>"formats"</td>
++<<<<<<< HEAD
 +    <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"<br>"sequencefile"
*</td>
+     <td>yes if type is file</td>
++>>>>>>> remotes/apache/gh-pages
      <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 -159,7 +164,11 @@@ For example, using uppercase letters i
  
  ## Storage Plugin REST API
  
++<<<<<<< HEAD
 +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:
++>>>>>>> remotes/apache/gh-pages
  
  * name  
    The storage plugin configuration name. 


Mime
View raw message