Merge
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d476ce58 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d476ce58 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d476ce58 Branch: refs/heads/gh-pages Commit: d476ce58309ec936caf466d216a3b1bd74dcc45b Parents: e8aba59 9d29728 Author: Tomer Shiran <[email protected]> Authored: Thu Jun 18 08:59:09 2015 -0700 Committer: Tomer Shiran <[email protected]> Committed: Thu Jun 18 08:59:09 2015 -0700 ---------------------------------------------------------------------- _data/docs.json | 183 ++++++++++++++++--- _docs/img/jreport-addtable.png | Bin 0 -> 95442 bytes _docs/img/jreport-catalogbrowser.png | Bin 0 -> 44988 bytes _docs/img/jreport-crosstab.png | Bin 0 -> 38885 bytes _docs/img/jreport-crosstab2.png | Bin 0 -> 59255 bytes _docs/img/jreport-crosstab3.png | Bin 0 -> 53791 bytes _docs/img/jreport-hostsfile.png | Bin 0 -> 119798 bytes _docs/img/jreport-queryeditor.png | Bin 0 -> 40606 bytes _docs/img/jreport-quotequalifier.png | Bin 0 -> 71219 bytes _docs/img/jreport_setenv.png | Bin 0 -> 63047 bytes .../odbc-jdbc-interfaces/015-using-jdbc-driver | 100 ++++++++++ .../015-using-jdbc-driver.md | 113 ++++++++++++ .../080-configuring-jreport.md | 34 ++++ team.md | 2 +- 14 files changed, 407 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/d476ce58/_data/docs.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/d476ce58/team.md ---------------------------------------------------------------------- diff --cc team.md index a42189a,a42189a..690fdd0 --- a/team.md +++ b/team.md @@@ -10,7 -10,7 +10,7 @@@ We welcome contributions to the project | Name | Alias (email is <alias>@apache.org) | |------|-------| --| **Jacques Nadeau (PMC Chair and VP Apache Drill)** | **jacques** | ++| Jacques Nadeau | jacques | | Tomer Shiran | tshiran | | Ted Dunning | tdunning | | Jason Frantz | jason |
