Skip to content

Update CHANGELOG and version number #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoag merged 2 commits into from
Sep 2, 2021
Merged

Update CHANGELOG and version number #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6d6187
Update CHANGELOG and version number
mxgrey Sep 1, 2021
b499b2b
Merge branch 'main' into prepare-1.4.0
Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions rmf_traffic/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## Changelog for package rmf_traffic

1.4.0 (2021-09-01)
------------------
* Mandate use of FCL>=0.6: [#39](https://github.com/open-rmf/rmf_traffic/pull/39)
* Make the stubborn negotiator's strategy more flexible: [#40](https://github.com/open-rmf/rmf_traffic/pull/40)
* Fix participant lifecycles: [#35](https://github.com/open-rmf/rmf_traffic/pull/35)

1.3.0 (2021-05-07)
------------------
* Allow a Database to be forked off of a Mirror: [#17](https://github.com/open-rmf/rmf_traffic/pull/17)
Expand Down
4 changes: 2 additions & 2 deletions rmf_traffic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5.0)

project(rmf_traffic VERSION 1.0.2)
project(rmf_traffic VERSION 1.4.0)

set(CMAKE_EXPORT_COMPILE_COMMANDS on)

Expand Down Expand Up @@ -65,7 +65,7 @@ if(BUILD_TESTING AND ament_cmake_catch2_FOUND AND rmf_cmake_uncrustify_FOUND)
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/>
)

find_file(uncrustify_config_file
find_file(uncrustify_config_file
NAMES "rmf_code_style.cfg"
PATHS "${rmf_utils_DIR}/../../../share/rmf_utils/")

Expand Down
2 changes: 1 addition & 1 deletion rmf_traffic/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rmf_traffic</name>
<version>1.3.0</version>
<version>1.4.0</version>
<description>Package for managing traffic in the Robotics Middleware Framework</description>
<maintainer email="grey@openrobotics.org">Grey</maintainer>
<maintainer email="marco@openrobotics.org">Marco A. Gutiérrez</maintainer>
Expand Down