Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to google/uuid #72

Merged
merged 1 commit into from
Apr 13, 2019
Merged

Switch to google/uuid #72

merged 1 commit into from
Apr 13, 2019

Conversation

justincormack
Copy link
Contributor

No functional change but this is being maintained here now.

Signed-off-by: Justin Cormack justin.cormack@docker.com

@justincormack
Copy link
Contributor Author

justincormack commented Mar 11, 2019 •
edited
Loading

(newer versions of pborman/uuid are a wrapper around google/uuid with some changes, but for this use case these don't matter).

from the release notes:
The choice of this package vs the google/uuid package is largely dependent on your use case. If you want to use UUIDs as keys, used the google/uuid version (a UUID is an array). Use this package for compatibility, needing to distinguish between non-set UUID and the zero UUID, prefer byte slices over arrays.

@justincormack justincormack changed the title Switch to google/uuid which is the maintained version of pborman/uuid Switch to google/uuid Mar 11, 2019
@thaJeztah thaJeztah mentioned this pull request Mar 13, 2019
Merged
@thaJeztah
Copy link
Contributor

ping @Mic92 @mmlb PTAL ❤️

@Mic92
Copy link
Contributor

Mic92 commented Mar 18, 2019

Also the question is if go-zfs really needs uuids in its logging code.

@justincormack
Switch to google/uuid which is the maintained version of pborman/uuid
b6cafe7 
No functional change but this is being maintained here now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Apr 5, 2019
@thaJeztah
bump containerd/zfs and dependencies
ed61d7f 
temporarily adds both pborman/uuid and google/uuid,
pending mistifyio/go-zfs#72

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Apr 5, 2019
Merged
@thaJeztah
Copy link
Contributor

Who's able to review/merge this? This would help us get rid of one dependency, and use the same UUID implementation across the board 🤗

trisk
trisk approved these changes Apr 13, 2019
View reviewed changes
Copy link
Member

@trisk trisk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good.

@trisk trisk merged commit f784269 into mistifyio:master Apr 13, 2019
@thaJeztah
Copy link
Contributor

Thank you!

@thaJeztah
Copy link
Contributor

Oh; wondering if a new tagged version is also planned; I see many people switching to Go mod, and having a new tag would help them get the latest changes from master

@thaJeztah thaJeztah mentioned this pull request Apr 14, 2019
Merged
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Apr 14, 2019
@thaJeztah
bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
c9059c7 
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Apr 14, 2019
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Apr 14, 2019
@thaJeztah
bump mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
179d51b 
full diff: mistifyio/go-zfs@22c9b32...f784269

relevant changes:

- mistifyio/go-zfs#50 Fix GetProperty always returning 'VALUE'
  - fixes mistifyio/go-zfs#49 dataset.GetProperty(key) always returns 'VALUE'
- mistifyio/go-zfs#53 Fix parseLine for fragmentation field
  - fixes mistifyio/go-zfs#52 setUint receives empty string for fragmentation in some cases
- mistifyio/go-zfs#54 Add 'referenced' to zfs properties
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Apr 16, 2019
@thaJeztah
bump mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
935d2ff 
full diff: mistifyio/go-zfs@22c9b32...f784269

relevant changes:

- mistifyio/go-zfs#50 Fix GetProperty always returning 'VALUE'
  - fixes mistifyio/go-zfs#49 dataset.GetProperty(key) always returns 'VALUE'
- mistifyio/go-zfs#53 Fix parseLine for fragmentation field
  - fixes mistifyio/go-zfs#52 setUint receives empty string for fragmentation in some cases
- mistifyio/go-zfs#54 Add 'referenced' to zfs properties
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 179d51ba984508a9cec5756cb56a67f17dd6f435
Component: engine
kiwik pushed a commit to theopenlab/containerd that referenced this pull request Apr 23, 2019
@Yikun @kiwik
Upstream sync (#2)
b6bc817 
* Add tcp service for grpc listeners

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Set nofile to 1048576

Closes containerd#3201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Fix API forward events for shims

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Add support for required plugins.

Signed-off-by: Lantao Liu <lantaol@google.com>

* Use $TEST_RUNTIME for cri test.

Signed-off-by: Lantao Liu <lantaol@google.com>

* Improve shim shutdown logic

Shims no longer call `os.Exit` but close the context on shutdown so that
events and other resources have hit the `defer`s.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Add dialer for events service

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Rename `hrpc` to `tcpServer`

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Check task list to avoid unnecessary cleanup.

Signed-off-by: Lantao Liu <lantaol@google.com>

* Correct import path in services/server package

Signed-off-by: Jared Cordasco <jcordasc@coglib.com>

* Correct PusherFunc helper to match Pusher intf

Signed-off-by: Jared Cordasco <jcordasc@coglib.com>

* Requeue events in the shim publisher

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb

- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Update go-winio in vendor.conf

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>

* Allow dumping stacks via ETW capture state

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>

* Access to client's GRPC connection object

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>

* .mailmap: update Akihiro Suda's email address

No affiliation change (NTT).

The former email address will continue to be available for the time being.

For daily communication, I still prefer to use my gmail.com address.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

* Move to sha-specified test image for nanoserver

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

* Fix error on pull hang in CI

Kill the underlying containerd after outputting error. Otherwise CI
hangs indefinitely and requires the CI infrastructure to kill the build
at the timeout expiration.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

* Write stack dump to `os.TempDir()` as well

Signed-off-by: John Howard <jhoward@microsoft.com>

* bump gocapability

full diff: syndtr/gocapability@db04d3c...d983527

changes included:

  - syndtr/gocapability#14 capability: Deprecate NewPid and NewFile for NewPid2 and NewFile2
  - syndtr/gocapability#16 Fix capHeader.pid type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3

full diff: golang/crypto@4979611...88737f5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Convert Windows CI to use Microsoft MCR image urls

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>

* Don't write dumped stacks to file for ETW capture state

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
kiku-jw pushed a commit to kiku-jw/moby that referenced this pull request May 16, 2019
@thaJeztah @kiku-jw
bump mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
ad50f8b 
full diff: mistifyio/go-zfs@22c9b32...f784269

relevant changes:

- mistifyio/go-zfs#50 Fix GetProperty always returning 'VALUE'
  - fixes mistifyio/go-zfs#49 dataset.GetProperty(key) always returns 'VALUE'
- mistifyio/go-zfs#53 Fix parseLine for fragmentation field
  - fixes mistifyio/go-zfs#52 setUint receives empty string for fragmentation in some cases
- mistifyio/go-zfs#54 Add 'referenced' to zfs properties
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request May 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trisk trisk trisk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@justincormack @thaJeztah @Mic92 @trisk