Commit Graph

30 Commits

Author SHA1 Message Date
Nik Everett f66e01369a Merge branch 'master' into feature/sql_2
Original commit: elastic/x-pack-elasticsearch@6ba2651f46
2018-02-01 17:21:37 -05:00
Lisa Cawley 83910f717e [DOCS] Build docs from elasticsearch (elastic/x-pack-elasticsearch#3638)
Original commit: elastic/x-pack-elasticsearch@379e93a887
2018-02-01 13:35:42 -08:00
Costin Leau cdfe0f1f5a Revert "Revert "Merge branch 'feature/sql'""
This reverts commit elastic/x-pack-elasticsearch@cc79e19911.

We'll merge this when we're good and ready.

Original commit: elastic/x-pack-elasticsearch@b3ef4f2836
2017-12-13 10:19:31 -05:00
Costin Leau 2e60e831c0 Revert "Merge branch 'feature/sql'"
This reverts commit elastic/x-pack-elasticsearch@2b3f7697a5, reversing
changes made to elastic/x-pack-elasticsearch@b79f16673c.

We're backing out all of SQL.

Original commit: elastic/x-pack-elasticsearch@cc79e19911
2017-12-13 09:33:13 -05:00
Nik Everett c27332be4a SQL: Fix docs build and cleanup docs index for merge
relates elastic/x-pack-elasticsearch#3084

Original commit: elastic/x-pack-elasticsearch@a64de41fbc
2017-12-11 16:39:18 -05:00
Nik Everett 2d9ce6132b SQL: Prepare docs for merge
Cleans up the index.asciidoc file so it merges cleanly with master and
builds SQL's docs.

Original commit: elastic/x-pack-elasticsearch@3c63c0bda0
2017-12-11 16:15:31 -05:00
Igor Motov a4915a5714 SQL: remove all remaining NOCOMMITs
relates elastic/x-pack-elasticsearch#2873

Original commit: elastic/x-pack-elasticsearch@68b206efd2
2017-11-21 14:37:59 -05:00
Nik Everett b2285ae66e Merge branch 'master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@b9d07ccd0f
2017-11-10 09:34:10 -05:00
Lisa Cawley 0c10d82f78 [DOCS] Added setup folder (elastic/x-pack-elasticsearch#2943)
Original commit: elastic/x-pack-elasticsearch@cc7027c7ec
2017-11-09 12:32:21 -08:00
Nik Everett 562117a7b7 Merge branch 'master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@c8368be422
2017-11-03 16:16:50 -04:00
Lisa Cawley aa41f27d93 [DOCS] Added X-Pack monitoring to Elasticsearch Reference (elastic/x-pack-elasticsearch#2831)
Original commit: elastic/x-pack-elasticsearch@123738556e
2017-11-02 09:25:10 -07:00
Costin Leau 31a952993a Merge remote-tracking branch 'remotes/upstream/master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@2ac0dab27b
2017-10-05 19:16:36 +03:00
lcawley feabaad46a [DOCS] Renamed X-Pack release notes
Original commit: elastic/x-pack-elasticsearch@485ddb14f2
2017-09-28 18:30:25 -07:00
Lisa Cawley 7a67f4bce5 [DOCS] Add X-Pack release notes to Elasticsearch Reference (elastic/x-pack-elasticsearch#2642)
* [DOCS] Add X-Pack release notes to Elasticsearch Reference

* [DOCS] Added X-Pack release note links

Original commit: elastic/x-pack-elasticsearch@2c2561cb6c
2017-09-28 18:04:02 -07:00
Nik Everett 2c183d566e Merge branch 'master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@53dc6d4ce7
2017-09-21 15:20:20 -04:00
lcawley 57f987b3b2 [DOCS] Added index-shared4 and index-shared5.asciidoc
Original commit: elastic/x-pack-elasticsearch@ef407e2677
2017-09-20 10:53:40 -07:00
Nik Everett bac9afee7e Merge branch 'master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@270ab71b19
2017-09-14 11:43:48 -04:00
Lisa Cawley 89d6c7e01e [DOCS] Create reference for users command (elastic/x-pack-elasticsearch#2480)
Original commit: elastic/x-pack-elasticsearch@d0afe8a20d
2017-09-13 17:16:06 -07:00
Nik Everett 810ca6637e Hack docs so we can build them without modifying core
Right now we'd like to be able to build the SQL docs without
modifying core even if they aren't quite how we're going to keep
them in the end. This removes the need for a change to core and
leaves a note that we'll have to make undo this commit before
release.

Original commit: elastic/x-pack-elasticsearch@9ca6a0e467
2017-08-29 14:49:30 -04:00
Deb Adair 1bb7d339e0 [DOCS] Skeleton for the sql plugin docs.
Original commit: elastic/x-pack-elasticsearch@f41ff1c993
2017-08-28 11:41:43 -07:00
Clinton Gormley fd518ea020 Include shared/attributes.asciidoc directly from docs master
Original commit: elastic/x-pack-elasticsearch@f3a0828c5d
2017-07-03 18:23:19 +02:00
lcawley c42a0844bc [DOCS] Re-add include-xpack attribute
Original commit: elastic/x-pack-elasticsearch@8312e2856f
2017-06-28 10:15:28 -07:00
Lisa Cawley 6d1f7bee10 [DOCS] Update links to use shared attributes (elastic/x-pack-elasticsearch#1855)
Original commit: elastic/x-pack-elasticsearch@b1553510b1
2017-06-27 09:46:56 -07:00
Lisa Cawley f2e20f86e4 [DOCS] Fix X-Pack settings for Elasticsearch (elastic/x-pack-elasticsearch#1863)
Original commit: elastic/x-pack-elasticsearch@8469db2909
2017-06-27 09:14:35 -07:00
Deb Adair f9f47d047d [DOCS] Wrapping up distribution of X-Pack settings reference info.
Original commit: elastic/x-pack-elasticsearch@0fd5d0d4d4
2017-06-26 09:04:56 -07:00
Lisa Cawley 4b03566726 [DOCS] Fix edit_url for Elasticsearch Ref (elastic/x-pack-elasticsearch#1814)
Original commit: elastic/x-pack-elasticsearch@170a9c91c2
2017-06-21 10:33:11 -07:00
Lisa Cawley 551f2f6ac2 [DOCS] Create X-Pack installation and introduction for Elasticsearch Ref (elastic/x-pack-elasticsearch#1698)
* [DOCS] Create X-Pack installation and introduction for Elasticsearch Reference

* [DOCS] Address feedback in X-Pack install and intro info

* [DOCS] Add X-Pack setup pages

* [DOCS] Add ML settings to Elasticsearch

* [DOCS] Add table for X-Pack settings

* [DOCS]Add logstash settings

Original commit: elastic/x-pack-elasticsearch@65786cff78
2017-06-19 18:01:52 -07:00
lcawley 68c1c15912 [DOCS] Rename index-all.asciidoc to index.asciidoc
Original commit: elastic/x-pack-elasticsearch@8c8cbdcc2a
2017-06-19 14:25:06 -07:00
Lisa Cawley 59d7484611 [DOCS] Call shared index files to build Elasticsearch Ref (elastic/x-pack-elasticsearch#1776)
* [DOCS] Call shared index files to build Elasticsearch Ref

* [DOCS] Fix path and edit URL for Elasticsearch build

Original commit: elastic/x-pack-elasticsearch@626d6d79d8
2017-06-19 13:33:00 -07:00
Lisa Cawley 429f7ca7a3 [DOCS] Build ES Reference from x-pack-elasticsearch (elastic/x-pack-elasticsearch#1722)
* [DOCS] Build ES Reference from x-pack-elasticsearch

* [DOCS] Added es-test-dir attribute

* [DOCS] Added plugins-examples-dir attribute

Original commit: elastic/x-pack-elasticsearch@05714eb8ca
2017-06-14 17:01:45 -07:00