Merge branch 'master' into usage_collection/remove-unused-application…

…UsageTracker
elastic · Mar 1, 2021 · 48f8678 · 48f8678
2 parents 42d4b1d + 1fa774c
commit 48f8678
Show file tree

Hide file tree

Showing 998 changed files with 24,726 additions and 4,155,049 deletions.
diff --git a/.bazeliskversion b/.bazeliskversion
@@ -1 +1 @@
-1.7.3
+1.7.5
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.4
+ARG NODE_VERSION=14.16.0
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .aws-config.json
 .signing-config.json
+/api_docs
 .ackrc
 /.es
 /.chromium