From df681b711b588e2e8e312d3daea4009f1de418b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 02:50:48 +0000
Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /mlflow/server/js

Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 mlflow/server/js/package-lock.json | 13 ++++++++++---
 mlflow/server/js/package.json      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mlflow/server/js/package-lock.json b/mlflow/server/js/package-lock.json
index 84c32613..9bd95af3 100644
--- a/mlflow/server/js/package-lock.json
+++ b/mlflow/server/js/package-lock.json
@@ -5166,6 +5166,13 @@
       "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
       "requires": {
         "merge": "^1.1.3"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+        }
       }
     },
     "execa": {
@@ -9735,9 +9742,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
diff --git a/mlflow/server/js/package.json b/mlflow/server/js/package.json
index a3ba497d..79d7719e 100644
--- a/mlflow/server/js/package.json
+++ b/mlflow/server/js/package.json
@@ -20,7 +20,7 @@
     "json-bigint": "databricks/json-bigint#a1defaf9cd8dd749f0fd4d5f83a22cd846789658",
     "leaflet": "^1.5.1",
     "lodash": "^4.17.11",
-    "merge": "1.2.1",
+    "merge": "2.1.1",
     "plotly.js": "1.50.0",
     "prop-types": "15.6.1",
     "qs": "6.5.2",