diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c867d04480fbd46fcf64700d88eb5ae54e7a7b..4fe9fc7c2d33a28466cb082c94cd56be0a9bc263 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 84048413b7a10e7baefae843c8916b1906bc4da3..592713aa196b56f7bc91acc92b472f098af68fc1 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 5000a6f66230f7033e3b0546bf02a3c4331f6632..175775ef51c136503dd0a065f8b7ee716fd5ef53 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'