From 36f63404b22fd6e5278ddb014ad4b717c9b2c0fd Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@googlemail.com>
Date: Sun, 4 Feb 2018 17:27:39 +0100
Subject: [PATCH] use Object.assign instead of _.merge

---
 lib/process-manager.js    | 3 +--
 lib/utils/port-polling.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/process-manager.js b/lib/process-manager.js
index d7773148e..8a33a2986 100644
--- a/lib/process-manager.js
+++ b/lib/process-manager.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const every = require('lodash/every');
-const merge = require('lodash/merge');
 const requiredMethods = [
     'start',
     'stop',
@@ -70,7 +69,7 @@ class ProcessManager {
     ensureStarted(options) {
         const portPolling = require('./utils/port-polling');
 
-        options = merge({
+        options = Object.assign({
             stopOnError: true,
             port: this.instance.config.get('server.port')
         }, options || {});
diff --git a/lib/utils/port-polling.js b/lib/utils/port-polling.js
index c4537acd3..d85d556c8 100644
--- a/lib/utils/port-polling.js
+++ b/lib/utils/port-polling.js
@@ -1,11 +1,10 @@
 'use strict';
 
 const net = require('net');
-const merge = require('lodash/merge');
 const errors = require('../errors');
 
 module.exports = function portPolling(options) {
-    options = merge({
+    options = Object.assign({
         timeoutInMS: 1000,
         maxTries: 20,
         delayOnConnectInMS: 3 * 1000,