Skip to content

Commit 9751646

Browse files
committed
Merge branch 'upstream-bump-v1.4.0' into 'master'
Bump version to 1.4.0 See merge request nvidia/container-toolkit/container-toolkit!24
2 parents 119f75d + 01063c0 commit 9751646

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MKDIR ?= mkdir
55
DIST_DIR ?= $(CURDIR)/dist
66

77
LIB_NAME := nvidia-container-toolkit
8-
LIB_VERSION := 1.3.0
8+
LIB_VERSION := 1.4.0
99
LIB_TAG ?=
1010

1111
GOLANG_VERSION := 1.14.2

packaging/debian/changelog

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
nvidia-container-toolkit (1.3.0-1) UNRELEASED; urgency=medium
1+
nvidia-container-toolkit (1.4.0-1) UNRELEASED; urgency=medium
2+
3+
* Add 'compute' capability to list of defaults
4+
* Add dependence on libnvidia-container-tools >= 1.3.1
5+
6+
-- NVIDIA CORPORATION <[email protected]> Fri, 11 Dec 2020 18:29:23 -0700
7+
8+
nvidia-container-toolkit (1.3.0-1) UNRELEASED; urgency=medium
29

310
* Promote 1.3.0~rc.2-1 to 1.3.0-1
411
* Add dependence on libnvidia-container-tools >= 1.3.0

packaging/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
1010

1111
Package: nvidia-container-toolkit
1212
Architecture: any
13-
Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.3.0), libnvidia-container-tools (<< 2.0.0)
13+
Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.3.1), libnvidia-container-tools (<< 2.0.0)
1414
Breaks: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook
1515
Replaces: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook
1616
Description: NVIDIA container runtime hook

packaging/rpm/SPECS/nvidia-container-toolkit.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
5353
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
5454

5555
%changelog
56+
* Fri Dec 11 2020 NVIDIA CORPORATION <[email protected]> 1.4.0-1
57+
- Add 'compute' capability to list of defaults
58+
- Add dependence on libnvidia-container-tools >= 1.3.1
59+
5660
* Wed Sep 16 2020 NVIDIA CORPORATION <[email protected]> 1.3.0-1
5761
- Promote 1.3.0-0.1.rc.2 to 1.3.0-1
5862
- Add dependence on libnvidia-container-tools >= 1.3.0

0 commit comments

Comments
 (0)