Merge branch 'master' into develop

jacob-meacham · jacob-meacham · commit d7a3b9028b3d · 2022-01-16T12:12:09.000-07:00
diff --git a/README.md b/README.md
@@ -83,6 +83,8 @@ custom:
 Please note that because these are resolved at build time, the plain-text passwords WILL be viewable in Cloudformation and on the Lambda dashboard.
 
 # Version History
+* 2.1.0
+  - Fix merge mutation issue (Thanks @onhate!)
 * 2.0.2
   - Fix CLI warning (Thanks @onhate!)
 * 2.0.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-deploy-environment",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Plugin the augments the serverless provider environment with deployment variables",
   "main": "lib/index.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "serverless-plugin-deploy-environment",`
`3`		`- "version": "2.0.2",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "Plugin the augments the serverless provider environment with deployment variables",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"files": [`