Prepare release for 11.6.0 (gazebosim#3019)

* Update changelog * Version 11.6.0
arohami · Jun 9, 2021 · 5e2f414 · 5e2f414
1 parent 6bc0f63
commit 5e2f414
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,11  18,11 @@ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
 
 set (GAZEBO_MAJOR_VERSION 11)
-set (GAZEBO_MINOR_VERSION 5)
 set (GAZEBO_MINOR_VERSION 6)
 # 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 1)
 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
@@ -8,6  8,20 @@
    use the previous behaviour and do not report these problems.
     * [Pull request #3017](https://github.com/osrf/gazebo/pull/3017)
 
 1. Allow specifying lens flare and camera distortion texture format
     * [Issue #3005](https://github.com/osrf/gazebo/issues/3005)
     * [Pull request #3007](https://github.com/osrf/gazebo/pull/3007)
 
 1.  Initialize the worldPoseDirty flag in Collision.cc
     * A contribution from Zachary Michaels [email protected]>
     * [Pull request #2999](https://github.com/osrf/gazebo/pull/2999)
 
 1.  Compile test plugins as MODULE instead of STATIC
     * [Pull request #2897](https://github.com/osrf/gazebo/pull/2897)
 
 1.  Add warning if GAZEBO_RESOURCE_PATH may not be set correctly
     * [Pull request #2991](https://github.com/osrf/gazebo/pull/2991)
 
 ## Gazebo 11.5.1 (2021-05-05)
 
 1. Avoid range-loop-construct in TopicManager