From 0696d4480f84501cf7fabaea744e1bf241ac8e72 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 24 Jun 2018 12:25:32 +0200
Subject: [PATCH] Release v3.20

---
 CMakeLists.txt           |  6 +++---
 ChangeLog                | 10 +++++-----
 NEWS                     |  4 ++--
 sonar-project.properties |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3376452ac6..e179a3e67a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,9 +105,9 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "19")
-set(SIMGRID_VERSION_PATCH "90")
-set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_MINOR "20")
+set(SIMGRID_VERSION_PATCH "0")
+# set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2018") # Year for copyright information
 
diff --git a/ChangeLog b/ChangeLog
index 62f81d8018..5f4dcfcfbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
-SimGrid (3.20) NOT RELEASED YET (Release target: June 21. 2018 10:07 UTC)
+SimGrid (3.20) Released June 24. 2018
 
 The proxy snake_case() release.
 
 S4U:
- - The whole API is now using snake_case() instead of mixing it with camelCase. C
-   ompatibility wrappers in place for one year.
+ - The whole API is now using snake_case() instead of mixing it with camelCase.
+   Compatibility wrappers in place for one year.
  - We took the opportunity to increase the consistency of the API.
    Please report any remaining glitches.
- - Introduced new function simgrid::s4u::Host::get_actor_count. This function
-   returns the number of actors running on a specific host.
+ - New function simgrid::s4u::Host::get_actor_count:
+   Returns the number of actors running on a specific host.
 
 SMPI:
  - SMPI is now tested with ~45 proxy apps from various sources, with none or
diff --git a/NEWS b/NEWS
index a862e7ec95..eab228e03e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,13 @@ __   _____ _ __ ___(_) ___  _ __   |___ / |___ \ / _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | | | |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) | / __/| |_| |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|\___/
-               (NOT RELEASED)
+               June 24. 2018
 
 The proxy snake_case() release.
 
  * Sanitize the public API. Compatibility wrappers in place for one year.
+ * More CI: ~45 Proxy Apps + BigDFT + StarPU now tested nightly
  * MPI: Port the trace replay engine to C++, fix visualization
- * More CI: ~45 proxy apps + BigDFT + StarPU now tested nightly
  * (+ the classical bug fixes and doc improvement)
 
                     _               _____  _  ___   _
diff --git a/sonar-project.properties b/sonar-project.properties
index 39e72748c7..cd397b4a36 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@
 
 sonar.projectKey=simgrid
 sonar.projectName=SimGrid
-sonar.projectVersion=3.19.90
+sonar.projectVersion=3.20
 
 sonar.links.homepage=http://simgrid.org
 sonar.links.issue=https://github.com/simgrid/simgrid/issues
-- 
2.20.1