Merge tag '2.1.1' into develop

2.1.1
TheHive-Project · Oct 9, 2018 · 1da7c7e · 1da7c7e
2 parents 024b1ff + 2a980e9
commit 1da7c7e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,23 @@
 # Change Log
 
-## [Unreleased](https://github.com/TheHive-Project/Cortex/tree/HEAD)
+## [2.1.1](https://github.com/TheHive-Project/Cortex/tree/2.1.1) (2018-10-09)
 
-[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0-RC1...HEAD)
+[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0...2.1.1)
+
+**Implemented enhancements:**
+
+- Change Debian dependencies [\#141](https://github.com/TheHive-Project/Cortex/issues/141)
+- Allow Cortex to use a custom root context [\#140](https://github.com/TheHive-Project/Cortex/issues/140)
+- Publish stable versions in beta package channels [\#138](https://github.com/TheHive-Project/Cortex/issues/138)
+
+**Fixed bugs:**
+
+- Fix Cache column in analyzers admin page [\#139](https://github.com/TheHive-Project/Cortex/issues/139)
+- RPM update replace configuration file [\#137](https://github.com/TheHive-Project/Cortex/issues/137)
+- Console output should not be logged in syslog [\#136](https://github.com/TheHive-Project/Cortex/issues/136)
+
+## [2.1.0](https://github.com/TheHive-Project/Cortex/tree/2.1.0) (2018-09-25)
+[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0-RC1...2.1.0)
 
 **Implemented enhancements:**
 
@@ -11,10 +26,10 @@
 
 **Fixed bugs:**
 
-- Temporary files are not removed at the end of job [\#129](https://github.com/TheHive-Project/Cortex/issues/129)
-- MISP fails to run analyzers [\#128](https://github.com/TheHive-Project/Cortex/issues/128)
 - MISP API fails [\#109](https://github.com/TheHive-Project/Cortex/issues/109)
 - File\_Info issue [\#53](https://github.com/TheHive-Project/Cortex/issues/53)
+- Temporary files are not removed at the end of job [\#129](https://github.com/TheHive-Project/Cortex/issues/129)
+- MISP fails to run analyzers [\#128](https://github.com/TheHive-Project/Cortex/issues/128)
 
 **Merged pull requests:**
 

diff --git a/app/org/thp/cortex/controllers/Default.scala → app/org/thp/cortex/controllers/Home.scala b/app/org/thp/cortex/controllers/Default.scala → app/org/thp/cortex/controllers/Home.scala
@@ -6,8 +6,8 @@ import play.api.mvc.{ AbstractController, Action, AnyContent, ControllerComponen
 import javax.inject.{ Inject, Singleton }
 
 @Singleton
-class Default @Inject() (configuration: Configuration, components: ControllerComponents) extends AbstractController(components) {
-  def home: Action[AnyContent] = Action {
+class Home @Inject() (configuration: Configuration, components: ControllerComponents) extends AbstractController(components) {
+  def redirect: Action[AnyContent] = Action {
     Redirect(configuration.get[String]("play.http.context").stripSuffix("/") + "/index.html")
   }
 }
diff --git a/conf/routes b/conf/routes
@@ -3,7 +3,7 @@
 # ~~~~
 
 
-GET           /                                                     org.thp.cortex.controllers.Default.home
+GET           /                                                     org.thp.cortex.controllers.Home.redirect
 GET           /api/health                                           org.thp.cortex.controllers.StatusCtrl.health
 GET           /api/logout                                           org.thp.cortex.controllers.AuthenticationCtrl.logout()
 POST          /api/login                                            org.thp.cortex.controllers.AuthenticationCtrl.login()

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -17,6 +17,6 @@ object Dependencies {
 
   val reflections = "org.reflections" % "reflections" % "0.9.11"
   val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
-  val elastic4play = "org.thehive-project" %% "elastic4play" % "1.6.2"
+  val elastic4play = "org.thehive-project" %% "elastic4play" % "1.6.3"
 }
 
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "2.1.0"
+version in ThisBuild := "2.1.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "2.1.0"
		version in ThisBuild := "2.1.1"