Skip to content

Merging Master - Stage 1#2

Merged
shimonmodi merged 45 commits intoshimonmodi:masterfrom
elastic:master
Nov 16, 2020
Merged

Merging Master - Stage 1#2
shimonmodi merged 45 commits intoshimonmodi:masterfrom
elastic:master

Conversation

@shimonmodi
Copy link
Copy Markdown
Owner

  • Have you signed the contributor license agreement?
  • Have you followed the contributor guidelines?
  • For proposing substantial changes or additions to the schema, have you reviewed the RFC process?
  • If submitting code/script changes, have you verified all tests pass locally using make test?
  • If submitting schema/fields updates, have you generated new artifacts by running make and committed those changes?
  • Is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.
  • Have you added an entry to the CHANGELOG.next.md?

ebeahan and others added 30 commits September 29, 2020 11:07
Co-authored-by: Mathieu Martin <webmat@gmail.com>
Co-authored-by: Mathieu Martin <mathieu.martin@elastic.co>
Co-authored-by: Mathieu Martin <webmat@gmail.com>
Co-authored-by: Mathieu Martin <webmat@gmail.com>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
)

This commit also includes one small adjustment to the generator.py script, to avoid creating an empty docs/ directory, since we don't generate it when --include or --subset are being used.
…#1041)

Also changing the order of the 'generate' task: it now starts with the new generator, then runs the legacy scripts.
Co-authored-by: Mathieu Martin <webmat@gmail.com>
* add wildcard type support

* also add version and constant_keyword

* changelog
@shimonmodi shimonmodi merged commit baa1eca into shimonmodi:master Nov 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants