Skip to content

Commit

Permalink
Merge #27443
Browse files Browse the repository at this point in the history 
27443: vendor: update github.com/google/btree r=nvanbenschoten a=nvanbenschoten

This picks up a `Clear` method on btree.

Pulled out of #26599 because it was annoying during rebases.

Release note: None

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
  • Loading branch information
@nvanbenschoten
craig[bot] and nvanbenschoten committed Jul 12, 2018
2 parents 7eb61b5 + ed77210 commit 9f30f01
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 38 files
+63 −3 github.com/google/btree/btree.go
+61 −0 github.com/shirou/gopsutil/LICENSE
+61 −0 github.com/shirou/gopsutil/disk/disk.go
+118 −0 github.com/shirou/gopsutil/disk/disk_darwin.go
+164 −0 github.com/shirou/gopsutil/disk/disk_darwin.h
+59 −0 github.com/shirou/gopsutil/disk/disk_darwin_386.go
+58 −0 github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
+58 −0 github.com/shirou/gopsutil/disk/disk_darwin_arm64.go
+95 −0 github.com/shirou/gopsutil/disk/disk_darwin_cgo.go
+18 −0 github.com/shirou/gopsutil/disk/disk_darwin_nocgo.go
+33 −0 github.com/shirou/gopsutil/disk/disk_fallback.go
+196 −0 github.com/shirou/gopsutil/disk/disk_freebsd.go
+112 −0 github.com/shirou/gopsutil/disk/disk_freebsd_386.go
+115 −0 github.com/shirou/gopsutil/disk/disk_freebsd_amd64.go
+447 −0 github.com/shirou/gopsutil/disk/disk_linux.go
+181 −0 github.com/shirou/gopsutil/disk/disk_openbsd.go
+91 −0 github.com/shirou/gopsutil/disk/disk_openbsd_amd64.go
+127 −0 github.com/shirou/gopsutil/disk/disk_solaris.go
+56 −0 github.com/shirou/gopsutil/disk/disk_unix.go
+171 −0 github.com/shirou/gopsutil/disk/disk_windows.go
+88 −0 github.com/shirou/gopsutil/disk/types_freebsd.go
+70 −0 github.com/shirou/gopsutil/disk/types_openbsd.go
+634 −0 github.com/shirou/gopsutil/internal/common/binary.go
+388 −0 github.com/shirou/gopsutil/internal/common/common.go
+69 −0 github.com/shirou/gopsutil/internal/common/common_darwin.go
+69 −0 github.com/shirou/gopsutil/internal/common/common_freebsd.go
+41 −0 github.com/shirou/gopsutil/internal/common/common_linux.go
+69 −0 github.com/shirou/gopsutil/internal/common/common_openbsd.go
+67 −0 github.com/shirou/gopsutil/internal/common/common_unix.go
+135 −0 github.com/shirou/gopsutil/internal/common/common_windows.go
+248 −0 github.com/shirou/gopsutil/net/net.go
+284 −0 github.com/shirou/gopsutil/net/net_darwin.go
+49 −0 github.com/shirou/gopsutil/net/net_fallback.go
+125 −0 github.com/shirou/gopsutil/net/net_freebsd.go
+791 −0 github.com/shirou/gopsutil/net/net_linux.go
+312 −0 github.com/shirou/gopsutil/net/net_openbsd.go
+96 −0 github.com/shirou/gopsutil/net/net_unix.go
+120 −0 github.com/shirou/gopsutil/net/net_windows.go

0 comments on commit 9f30f01

Please sign in to comment.