From 8f21ff69a1492db47938cf0fead18450b96286ca Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 10 Dec 2020 07:35:02 -0800 Subject: [PATCH 1/2] 3.1.0 release prep Signed-off-by: Nate Koenig --- CMakeLists.txt | 2 +- Changelog.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6daac780..5e159b57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-launch3 VERSION 3.0.0) +project(ignition-launch3 VERSION 3.1.0) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index 45be3290..526a6764 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,8 @@ ## Ignition Launch 3.x -### Ignition Launch 3.X.X (20XX-XX-XX) +### Ignition Launch 3.1.0 (2020-12-10) + +1. All changes up to and including those in version 2.2.0. ### Ignition Launch 3.0.0 (2020-09-30) @@ -22,9 +24,9 @@ ### Ignition Launch 2.2.0 (2020-10-14) -* All changes up to and including those in version 1.10.0 +1. All changes up to and including those in version 1.10.0 -* Added a tutorial. +1. Added a tutorial. * [Pull request 48](https://github.com/ignitionrobotics/ign-launch/pull/48) ### Ignition Launch 2.1.0 (2020-05-21) From 5edccf2c350bbb0a240dc1ff14f091a0e9e98647 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 10 Dec 2020 07:57:25 -0800 Subject: [PATCH 2/2] Added PR 68 to changelog Signed-off-by: Nate Koenig --- Changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog.md b/Changelog.md index 526a6764..6175b88c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -68,6 +68,9 @@ 1. Add support for specifying topics to record * [Pull Request 54](https://github.com/ignitionrobotics/ign-launch/pull/54) +1. Fix race condition in websocket server. + * [Pull Request 68](https://github.com/ignitionrobotics/ign-launch/pull/68) + ### Ignition Launch 1.9.0 (2020-08-13) 1. Added HTTP handling support to websocket server and a metrics HTTP endpoint