revert redundant build for windows changes

containernetworking · Nov 11, 2017 · f6d364f · f6d364f
1 parent 2f864f2
commit f6d364f
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 66 deletions.
diff --git a/pkg/ip/addr_linux.go b/pkg/ip/addr_linux.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/ip/ipmasq_linux.go b/pkg/ip/ipmasq_linux.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/ip/link_linux.go b/pkg/ip/link_linux.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/ipam/exec.go b/pkg/ipam/exec.go
diff --git a/pkg/ipam/ipam_linux_test.go b/pkg/ipam/ipam_linux_test.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/ipam/ipam_suite_test.go b/pkg/ipam/ipam_suite_test.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2016 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/ipam/ipam_windows.go b/pkg/ipam/ipam_windows.go
diff --git a/plugins/ipam/host-local/backend/store.go b/plugins/ipam/host-local/backend/store.go
@@ -19,6 +19,7 @@ import "net"
 type Store interface {
 	Lock() error
 	Unlock() error
+	Close() error
 	Reserve(id string, ip net.IP, rangeID string) (bool, error)
 	LastReservedIP(rangeID string) (net.IP, error)
 	Release(ip net.IP) error

diff --git a/plugins/meta/flannel/flannel_suite_test.go b/plugins/meta/flannel/flannel_suite_test.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");