Merge branch '7.x' into backport/7.x/pr-4461

elastic · Dec 14, 2020 · 6a0dbe5 · 6a0dbe5
2 parents 1f926c6 + 85b27f9
commit 6a0dbe5
Show file tree

Hide file tree

Showing 41 changed files with 7,935 additions and 1,910 deletions.
diff --git a/Makefile b/Makefile
@@ -109,7 +109,6 @@ update: fields go-generate add-headers copy-docs notice $(MAGE)
 	@$(MAGE) update
 
 fields_sources=\
-  _meta/fields.common.yml \
   $(shell find model -name fields.yml) \
   $(shell find x-pack/apm-server/fields -name fields.yml)
 

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -3498,11 +3498,6 @@ Contents of "LICENSE":
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------------------------
-Dependency: github.com/ua-parser/uap-go
-Revision: e1c09f13e2fe
-License type (autodetected): Apache-2.0
-
 --------------------------------------------------------------------
 Dependency: github.com/uber/tchannel-go
 Version: v1.16.0