From f59f2a65aa7a80f417a3528cf9fe1cd511caed30 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 10 Oct 2019 23:09:40 +0200 Subject: [PATCH] Start the dev of v3.24.1. --- CMakeLists.txt | 2 +- ChangeLog | 4 ++++ NEWS | 7 +++++++ docs/source/conf.py | 2 +- setup.py | 2 +- sonar-project.properties | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb44314baf..398bef8e12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ endif() set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "24") -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 set(SIMGRID_VERSION_DATE "2019") # Year for copyright information diff --git a/ChangeLog b/ChangeLog index ca548e7e42..b5942a0538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ ---------------------------------------------------------------------------- +SimGrid (3.24.1) NOT RELEASED YET (v3.25 expected December 22. 2029, 04:19 UTC) + +---------------------------------------------------------------------------- + SimGrid (3.24) October 9. 2019 The Clean Disk Release. diff --git a/NEWS b/NEWS index 23ac2aeaa3..c71262ecda 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + _ _____ ____ ____ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \| ___| +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) |___ \ + \ V / __/ | \__ \ | (_) | | | | ___) | / __/ ___) | + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____|____/ + (not released yet) + _ _____ ____ _ _ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \| || | \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | || |_ diff --git a/docs/source/conf.py b/docs/source/conf.py index 019cb17c55..a3cf0007be 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -36,7 +36,7 @@ copyright = u'2002-2019, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.24' +version = u'3.24.1' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index 55ebf64fc9..bd48de0655 100755 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.24', + version='3.24.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 2ff23459ae..b1ac57cfe4 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.24 +sonar.projectVersion=3.24.1 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues -- 2.20.1