Merge branch 'release/3.1.2'

TheHive-Project · Oct 12, 2018 · 708adf6 · 708adf6
2 parents 85035e7 + 011795e
commit 708adf6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,21 @@
 # Change Log
 
-## [3.1.1](https://github.com/TheHive-Project/TheHive/tree/3.1.1) (2018-10-09)
+## [3.1.2](https://github.com/TheHive-Project/TheHive/tree/3.1.2) (2018-10-12)
+[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.1.1...3.1.2)
+
+**Fixed bugs:**
+
+- Cortex polling settings break startup [\#754](https://github.com/TheHive-Project/TheHive/issues/754)
 
+## [3.1.1](https://github.com/TheHive-Project/TheHive/tree/3.1.1) (2018-10-09)
 [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.1.0...3.1.1)
 
 **Implemented enhancements:**
 
+- Allow TheHive to use a custom root context [\#752](https://github.com/TheHive-Project/TheHive/issues/752)
+- Change Debian dependencies [\#751](https://github.com/TheHive-Project/TheHive/issues/751)
 - Publish stable versions in beta package channels [\#733](https://github.com/TheHive-Project/TheHive/issues/733)
 - url category to MISP: poll for default [\#732](https://github.com/TheHive-Project/TheHive/issues/732)
-- Change Debian dependencies [\#751](https://github.com/TheHive-Project/TheHive/issues/751)
 
 **Fixed bugs:**
 

diff --git a/ui/bower.json b/ui/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "license": "AGPL-3.0",
   "dependencies": {
     "angular": "1.5.8",

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.1.1"
+version in ThisBuild := "3.1.2"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "3.1.1"
		version in ThisBuild := "3.1.2"