start the dev of v3.22

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e9c98d..5abb679 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,8 +109,8 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "21")
-set(SIMGRID_VERSION_PATCH "0")
-#set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_PATCH "90")
+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 dc87677..3fe5f93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+SimGrid (3.22) NOT RELEASED (Release Target: December 21. 2018, 22:23 UTC)
+
 SimGrid (3.21) October 3. 2018
 
 The Restarting Documentation (TRD) Release.

diff --git a/NEWS b/NEWS
index 965bd0b..c5a113b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+                    _               _____  ____  ____
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ \|___ \
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | __) |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | / __/ / __/
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|_____|
+               (not released)
+
                     _               _____  ____  _
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ \/ |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | |

diff --git a/docs/source/conf.py b/docs/source/conf.py
index b57d1f3..74a7928 100644 (file)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -35,7 +35,7 @@ copyright = u'2002-2018, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version
-version = u'3.21'
+version = u'alpha 3.22'
 # The full version, including alpha/beta/rc tags
 release = u'3.21'
 

diff --git a/sonar-project.properties b/sonar-project.properties
index c68483b..99f0f9a 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@
 
 sonar.projectKey=simgrid
 sonar.projectName=SimGrid
-sonar.projectVersion=3.21
+sonar.projectVersion=3.21.90
 
 sonar.links.homepage=http://simgrid.org
 sonar.links.issue=https://github.com/simgrid/simgrid/issues