From 37cbc8fecf4148dfbf353ae9603bc7382dc67fcc Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 6 Aug 2020 09:58:37 -0700 Subject: [PATCH 1/4] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=209.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 4 ++-- Changelog.md | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e6dc60798..626562dd88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,11 +14,11 @@ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) set (GAZEBO_MAJOR_VERSION 9) -set (GAZEBO_MINOR_VERSION 13) +set (GAZEBO_MINOR_VERSION 14) # The patch version may have been bumped for prerelease purposes; be sure to # check gazebo-release/ubuntu/debian/changelog@default to determine what the # next patch version should be for a regular release. -set (GAZEBO_PATCH_VERSION 2) +set (GAZEBO_PATCH_VERSION 0) set (GAZEBO_VERSION ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}) set (GAZEBO_VERSION_FULL ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}.${GAZEBO_PATCH_VERSION}) diff --git a/Changelog.md b/Changelog.md index 7b22e6ebbc..7b30f3e467 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,10 @@ ## Gazebo 9.xx.x (202x-xx-xx) -## Gazebo 9.13.2 (202x-xx-xx) +## Gazebo 9.14.0 (2020-08-06) + +1. Lockstep between sensors and physics + * [Pull request #2793](https://github.com/osrf/gazebo/pull/2793) 1. Fix sensor update rate throttling when new sensors are spawned * [Pull request #2784](https://github.com/osrf/gazebo/pull/2784) From 99b188a2a4ab44555dfc347d8436a09b8c38df82 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 6 Aug 2020 10:20:05 -0700 Subject: [PATCH 2/4] update changelog Signed-off-by: Louise Poubel --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 7b30f3e467..a44d494152 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,8 @@ 1. Lockstep between sensors and physics * [Pull request #2793](https://github.com/osrf/gazebo/pull/2793) +## Gazebo 9.14.0 (2020-07-20) + 1. Fix sensor update rate throttling when new sensors are spawned * [Pull request #2784](https://github.com/osrf/gazebo/pull/2784) From fa42c19c836cfb6845c6350d407aadf407cf19df Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 6 Aug 2020 10:21:39 -0700 Subject: [PATCH 3/4] 9.13.2 Signed-off-by: Louise Poubel --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a44d494152..8de5b83869 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,7 +7,7 @@ 1. Lockstep between sensors and physics * [Pull request #2793](https://github.com/osrf/gazebo/pull/2793) -## Gazebo 9.14.0 (2020-07-20) +## Gazebo 9.13.2 (2020-07-20) 1. Fix sensor update rate throttling when new sensors are spawned * [Pull request #2784](https://github.com/osrf/gazebo/pull/2784) From 1abae8710a29ea2f018140f115537cf29ba27e8c Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 7 Aug 2020 16:20:45 -0700 Subject: [PATCH 4/4] changelog Signed-off-by: Louise Poubel --- Changelog.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 8de5b83869..dd64ca272d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,11 +2,14 @@ ## Gazebo 9.xx.x (202x-xx-xx) -## Gazebo 9.14.0 (2020-08-06) +## Gazebo 9.14.0 (2020-08-07) 1. Lockstep between sensors and physics * [Pull request #2793](https://github.com/osrf/gazebo/pull/2793) +1. Fix race condition on Publisher shutdown + * [Pull request #2812](https://github.com/osrf/gazebo/pull/2812) + ## Gazebo 9.13.2 (2020-07-20) 1. Fix sensor update rate throttling when new sensors are spawned