Skip to content

Commit fc5816a

Browse files
committed
OS-5798 imgadm should allow "+" in an image manifest "version", per semver
Reviewed by: Todd Whiteman <todd.whiteman@joyent.com> Approved by: Todd Whiteman <todd.whiteman@joyent.com>
1 parent 99b8e5f commit fc5816a

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/img/CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Known issues:
66
Docker Registry v1, which is now deprecated.
77

88

9+
## 3.7.0
10+
11+
- OS-5798 Allow '+' in the image manifest "version" field.
12+
913
## 3.6.2
1014

1115
- OS-5335 docker image import should disallow meaningless operations

src/img/node_modules/imgmanifest/lib/imgmanifest.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/img/node_modules/imgmanifest/package.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/img/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "imgadm",
33
"description": "Manage SmartOS virtual machine images.",
4-
"version": "3.6.2",
4+
"version": "3.7.0",
55
"author": "Joyent (joyent.com)",
66
"private": true,
77
"dependencies": {
@@ -13,7 +13,7 @@
1313
"docker-registry-client": "git://github.com/joyent/node-docker-registry-client.git#765e74c",
1414
"extsprintf": "1.2.0",
1515
"findit2": "2.2.3",
16-
"imgmanifest": "git://github.com/joyent/node-imgmanifest.git#4f80d8c",
16+
"imgmanifest": "2.3.0",
1717
"mkdirp": "0.5.0",
1818
"node-uuid": "1.4.1",
1919
"once": "1.3.1",

0 commit comments

Comments
 (0)