From b020e48b89a675ae681eb5bcead01035405b571e Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Wed, 29 Jul 2020 22:04:36 +0200
Subject: [PATCH] [misc] bump version 1.4.0
---
CHANGELOG.md | 10 ++++++++--
CMakeLists.txt | 2 +-
meson.build | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8c867d..4fe9fc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,11 @@ Batsched adheres to [Semantic Versioning][semver] and its public API is the foll
[//]: =========================================================================
## [Unreleased]
-- Add a new `fcfs` algorithm (copied from `fcfs_fast`) that takes into account
+
+[//]: =========================================================================
+## [1.4.0] - 2020-07-29 - For [Batsim v4.0.0][Batsim v4.0.0]
+### Added
+- New `fcfs` algorithm (copied from `fcfs_fast`) that takes into account
the resources selector given in parameter.
### Fixed
@@ -93,8 +97,10 @@ Initial release.
[Batsim v2.0.0]: https://batsim.readthedocs.io/en/latest/changelog.html#v2-0-0
[Batsim v3.0.0]: https://batsim.readthedocs.io/en/latest/changelog.html#v3-0-0
+[Batsim v4.0.0]: https://batsim.readthedocs.io/en/latest/changelog.html#v4-0-0
-[Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.3.0...master
+[Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.4.0...master
+[1.4.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.3.0...v1.4.0
[1.3.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.1...v1.3.0
[1.2.1]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.0...v1.2.1
[1.2.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.1.0...v1.2.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8404841..592713a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
####################
# Batsched version #
####################
-set(default_batsched_version "v1.3.0")
+set(default_batsched_version "v1.4.0")
include(GetGitRevisionDescription)
git_describe(batsched_version)
message(STATUS "Batsched version from git: ${batsched_version}")
diff --git a/meson.build b/meson.build
index 5000a6f..175775e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('batsched', 'cpp',
- version: '1.3.0',
+ version: '1.4.0',
license: 'free',
default_options: ['cpp_std=c++11'],
meson_version: '>=0.40.0'
--
GitLab