Merging upstream version 1.29.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 22 insertions, 19 deletions

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8f0795d1c..04f91bff5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ on:
     inputs:
       version:
         name: Version Tag
-        default: latest
+        default: nightly
         required: true
 jobs:
   docker-build:
diff --git a/.travis.yml b/.travis.yml
index c7a6074d6..8c95f5d1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -353,7 +353,9 @@ jobs:
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Draft release submission failed"
 
     - name: Trigger Docker image build and publish
-      script: .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
+      script:
+        - git checkout "${TRAVIS_BRANCH}" && export BUILD_VERSION="$(cat packaging/version | cut -d'-' -f1)"
+        - .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Failed to trigger docker build during release" "${NOTIF_CHANNEL}"
 
     - stage: Trigger deb and rpm package build (release)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d97f30a..fb2b953ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,17 @@
 # Changelog
 
-## [v](https://github.com/netdata/netdata/tree/v) (2021-02-03)
+## [v1.29.1](https://github.com/netdata/netdata/tree/v1.29.1) (2021-02-09)
 
-[Full Changelog](https://github.com/netdata/netdata/compare/v1.28.0...v)
+[Full Changelog](https://github.com/netdata/netdata/compare/v1.29.0...v1.29.1)
+
+**Merged pull requests:**
+
+- Fix crash during shutdown of cgroups internal plugin. [\#10614](https://github.com/netdata/netdata/pull/10614) ([mfundul](https://github.com/mfundul))
+- Update latest release on main README [\#10590](https://github.com/netdata/netdata/pull/10590) ([joelhans](https://github.com/joelhans))
+
+## [v1.29.0](https://github.com/netdata/netdata/tree/v1.29.0) (2021-02-03)
+
+[Full Changelog](https://github.com/netdata/netdata/compare/v1.28.0...v1.29.0)
 
 **Merged pull requests:**
 
@@ -224,9 +233,6 @@
 - Fix typo inside netdata-installer.sh [\#9962](https://github.com/netdata/netdata/pull/9962) ([thiagoftsm](https://github.com/thiagoftsm))
 - Add missing period in netdata dashboard [\#9960](https://github.com/netdata/netdata/pull/9960) ([hydrogen-mvm](https://github.com/hydrogen-mvm))
 - Fixed chart's last accessed time during context queries [\#9952](https://github.com/netdata/netdata/pull/9952) ([stelfrag](https://github.com/stelfrag))
-- adds missing file netdata.crontab to gitignore [\#9946](https://github.com/netdata/netdata/pull/9946) ([underhood](https://github.com/underhood))
-- Updated RPM spec file to use automatic dependency list generation. [\#9937](https://github.com/netdata/netdata/pull/9937) ([Ferroin](https://github.com/Ferroin))
-- Add information about Cloud disabled status to `-W buildinfo`. [\#9936](https://github.com/netdata/netdata/pull/9936) ([underhood](https://github.com/underhood))
 
 ## [before_rebase](https://github.com/netdata/netdata/tree/before_rebase) (2020-09-24)
 
diff --git a/README.md b/README.md
index dcc7e34f9..33c061699 100644
--- a/README.md
+++ b/README.md
@@ -34,17 +34,11 @@ People get addicted to Netdata. Once you use it on your systems, there's no goin
 ![Users who are addicted to
 Netdata](https://user-images.githubusercontent.com/1153921/96495792-2e881380-11fd-11eb-85a3-53d3a84dcb29.png)
 
-> **[Latest release](https://github.com/netdata/netdata/releases/latest): v1.28.0, December 18, 2020**
+> **[Latest release](https://github.com/netdata/netdata/releases/latest): v1.29.0, February 2, 2021**
 >
-> Release v1.28.0 is a hotfix release to address a deadlock in the Netdata Agent. We intended to release this hotfix as 
-> v1.27.1, but we can't backtrack on a release once we've begun to publish new Docker images and binary packages on 
-> other platforms.
->
-> **v1.27.0, December 17, 2020**
->
-> The v1.27.0 release of the Netdata Agent brings dramatic improvements to long-term metrics storage via the database 
-> engine, and new dashboard features like a time & date picker for visualizing precise timeframes. Two new collectors 
-> bring incredible new value to existing features, including a bit of machine learning magic.
+> The v1.29.0 release of the Netdata Agent is a maintenance release that brings incremental but necessary improvements 
+> that make your monitoring experience more robust. We've pushed improvements and bug fixes to the installation and 
+> update scripts, enriched our library of collectors, and focused on fixing bugs reported by the community.
 
 ## Menu
 
diff --git a/collectors/cgroups.plugin/sys_fs_cgroup.c b/collectors/cgroups.plugin/sys_fs_cgroup.c
index 705c51735..df1f5f21a 100644
--- a/collectors/cgroups.plugin/sys_fs_cgroup.c
+++ b/collectors/cgroups.plugin/sys_fs_cgroup.c
@@ -3937,9 +3937,10 @@ static void cgroup_main_cleanup(void *ptr) {
 
     if (!discovery_thread.exited) {
         info("stopping discovery thread worker");
-        uv_mutex_unlock(&discovery_thread.mutex);
+        uv_mutex_lock(&discovery_thread.mutex);
         discovery_thread.start_discovery = 1;
         uv_cond_signal(&discovery_thread.cond_var);
+        uv_mutex_unlock(&discovery_thread.mutex);
     }
 
     while (!discovery_thread.exited && max > 0) {
diff --git a/packaging/version b/packaging/version
index 9b277b94a..d52647a80 100644
--- a/packaging/version
+++ b/packaging/version
@@ -1 +1 @@
-v1.29.0
+v1.29.1