From: Arnaud Giersch Date: Tue, 15 Dec 2020 21:56:58 +0000 (+0100) Subject: Start the dev of 3.27. X-Git-Tag: v3.27~619 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/40af9c2192a6454f202efff596f56ed2782192b0 Start the dev of 3.27. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d5843c05f2..dae34bc442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "26") -set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot +set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") diff --git a/ChangeLog b/ChangeLog index 296f935be9..54d1ca0d5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ ---------------------------------------------------------------------------- +SimGrid (3.26.1) NOT RELEASED YET (v3.27 expected March 20. 2021, 09:37 UTC) + +---------------------------------------------------------------------------- + SimGrid (3.26) December 15. 2020 The Release release (the French lockdown was eased today). diff --git a/NEWS b/NEWS index 325d1d016d..1aafa265c2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + _ _____ ____ _____ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \___ | +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | / / + \ V / __/ | \__ \ | (_) | | | | ___) | / __/ / / + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____/_/ + (unreleased) + _ _____ ____ __ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \ / /_ \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | '_ \ diff --git a/docs/source/conf.py b/docs/source/conf.py index dbb73b9137..9386f7b2a6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -36,7 +36,7 @@ copyright = u'2002-2020, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.26' +version = u'3.26.1' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index 04ddf032f3..330598ca20 100755 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.26', + version='3.26.1', author='Da SimGrid Team', author_email='simgrid-devel@lists.gforge.inria.fr', description='Toolkit for scalable simulation of distributed applications', diff --git a/sonar-project.properties b/sonar-project.properties index 271ba67ef6..a559c31976 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,7 +4,7 @@ sonar.organization=simgrid sonar.projectKey=simgrid_simgrid sonar.projectName=SimGrid -sonar.projectVersion=3.26 +sonar.projectVersion=3.26.1 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues