Merge branch 'upstream-bump-v2.6.0' into 'master'

Bump version to 2.6.0 See merge request nvidia/container-toolkit/nvidia-docker!17
NVIDIA · Apr 29, 2021 · 26efc6d · 26efc6d
2 parents b17795a + a55df56
commit 26efc6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -5,10 +5,10 @@ MKDIR  ?= mkdir
 DIST_DIR ?= $(CURDIR)/dist
 
 LIB_NAME := nvidia-docker2
-LIB_VERSION := 2.5.0
+LIB_VERSION := 2.6.0
 PKG_REV := 1
 
-RUNTIME_VERSION := 3.4.0
+RUNTIME_VERSION := 3.5.0
 
 # Supported OSs by architecture
 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+nvidia-docker2 (2.6.0-1) UNRELEASED; urgency=medium
+
+  * Add dependence on nvidia-container-runtime >= 3.5.0
+  * Add Jenkinsfile for building packages
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Thu, 29 Apr 2021 05:25:25 +0000
+
 nvidia-docker2 (2.5.0-1) UNRELEASED; urgency=medium
 
   * Bump version to v2.5.0

diff --git a/rpm/SPECS/nvidia-docker2.spec b/rpm/SPECS/nvidia-docker2.spec
@@ -37,6 +37,10 @@ install -m 644 -t %{buildroot}/etc/docker daemon.json
 %config /etc/docker/daemon.json
 
 %changelog
+* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.6.0-1
+- Add dependence on nvidia-container-runtime >= 3.5.0
+- Add Jenkinsfile for building packages
+
 * Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.5.0-1
 - Bump version to v2.5.0
 - Add dependence on nvidia-container-runtime >= 3.4.0