From 30a07a9a4897bb7a37ec0c5b9b937ad45f1b8817 Mon Sep 17 00:00:00 2001
From: Lance Ball <lball@redhat.com>
Date: Mon, 26 Mar 2018 10:34:26 -0400
Subject: [PATCH] chore(release): 1.4.0

---
 CHANGELOG.md      | 17 +++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a392ed..87a4f84b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/bucharest-gold/opossum/compare/v1.3.1...v1.4.0) (2018-03-26)
+
+
+### Bug Fixes
+
+* address sec vuln in marked coming from jsdoc ([224c6ef](https://github.com/bucharest-gold/opossum/commit/224c6ef))
+* security issue related to electron version ([#138](https://github.com/bucharest-gold/opossum/issues/138)) ([4739c62](https://github.com/bucharest-gold/opossum/commit/4739c62))
+
+
+### Features
+
+* add enable/disable for a circuit ([#160](https://github.com/bucharest-gold/opossum/issues/160)) ([016eba5](https://github.com/bucharest-gold/opossum/commit/016eba5))
+* allow multiple circuits to aggregate stats ([#140](https://github.com/bucharest-gold/opossum/issues/140)) ([ba71840](https://github.com/bucharest-gold/opossum/commit/ba71840))
+
+
+
 <a name="1.3.1"></a>
 ## [1.3.1](https://github.com/bucharest-gold/opossum/compare/v1.3.0...v1.3.1) (2017-12-14)
 
diff --git a/package-lock.json b/package-lock.json
index f21774e0..50178dc7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "opossum",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f4214889..e5712f49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opossum",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "author": "Red Hat, Inc.",
   "license": "Apache-2.0",
   "scripts": {