@@ -130,7 +130,7 @@ github.com/containerd/ttrpc                         f02858b1457c5ca3aaec3a0803eb

 github.com/gogo/googleapis                          08a7655d27152912db7aaf4f983275eaf8d128ef

 # cluster

-github.com/docker/swarmkit                          18e7e58ea1a5ec016625a636d0d52500eea123bc

+github.com/docker/swarmkit                          59163bf75df38489d4a10392265d27156dc473c5

 github.com/gogo/protobuf                            4cbf7e384e768b4e01799441fdf2a706a5635ae7 # v1.2.0

 github.com/cloudflare/cfssl                         5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2

 github.com/fernet/fernet-go                         1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2

@@ -141,7 +141,7 @@ github.com/hashicorp/go-memdb                       cb9a474f84cc5e41b273b20c6927

 github.com/hashicorp/go-immutable-radix             826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git

 github.com/hashicorp/golang-lru                     7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c # v0.5.1

 github.com/coreos/pkg                               3ac0863d7acf3bc44daf49afef8919af12f704ef # v3

-github.com/pivotal-golang/clock                     3fd3c1944c59d9742e1cd333672181cd1a6f9fa0

+code.cloudfoundry.org/clock                         02e53af36e6c978af692887ed449b74026d76fec

 # prometheus

 github.com/prometheus/client_golang                 c5b7fccd204277076155f10851dad72b76a49317 # v0.8.0

new file mode 100644

@@ -0,0 +1,201 @@

+                                 Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) on an "AS IS" BASIS,

+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+      implied, including, without limitation, any warranties or conditions

+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+      PARTICULAR PURPOSE. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "[]"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,20 @@

+Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.

+

+This project contains software that is Copyright (c) 2015 Pivotal Software, Inc.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+   http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+

+This project may include a number of subcomponents with separate

+copyright notices and license terms. Your use of these subcomponents

+is subject to the terms and conditions of each subcomponent's license,

+as noted in the LICENSE file.

new file mode 100644

@@ -0,0 +1,5 @@

+# clock

+

+**Note**: This repository should be imported as `code.cloudfoundry.org/clock`.

+

+Provides a `Clock` interface, useful for injecting time dependencies in tests.

new file mode 100644

@@ -0,0 +1,53 @@

+package clock

+

+import "time"

+

+type Clock interface {

+	Now() time.Time

+	Sleep(d time.Duration)

+	Since(t time.Time) time.Duration

+	// After waits for the duration to elapse and then sends the current time

+	// on the returned channel.

+	// It is equivalent to clock.NewTimer(d).C.

+	// The underlying Timer is not recovered by the garbage collector

+	// until the timer fires. If efficiency is a concern, use clock.NewTimer

+	// instead and call Timer.Stop if the timer is no longer needed.

+	After(d time.Duration) <-chan time.Time

+

+	NewTimer(d time.Duration) Timer

+	NewTicker(d time.Duration) Ticker

+}

+

+type realClock struct{}

+

+func NewClock() Clock {

+	return &realClock{}

+}

+

+func (clock *realClock) Now() time.Time {

+	return time.Now()

+}

+

+func (clock *realClock) Since(t time.Time) time.Duration {

+	return time.Now().Sub(t)

+}

+

+func (clock *realClock) Sleep(d time.Duration) {

+	<-clock.NewTimer(d).C()

+}

+

+func (clock *realClock) After(d time.Duration) <-chan time.Time {

+	return clock.NewTimer(d).C()

+}

+

+func (clock *realClock) NewTimer(d time.Duration) Timer {

+	return &realTimer{

+		t: time.NewTimer(d),

+	}

+}

+

+func (clock *realClock) NewTicker(d time.Duration) Ticker {

+	return &realTicker{

+		t: time.NewTicker(d),

+	}

+}

new file mode 100644

@@ -0,0 +1 @@

+package clock // import "code.cloudfoundry.org/clock"

new file mode 100644

@@ -0,0 +1,20 @@

+package clock

+

+import "time"

+

+type Ticker interface {

+	C() <-chan time.Time

+	Stop()

+}

+

+type realTicker struct {

+	t *time.Ticker

+}

+

+func (t *realTicker) C() <-chan time.Time {

+	return t.t.C

+}

+

+func (t *realTicker) Stop() {

+	t.t.Stop()

+}

new file mode 100644

@@ -0,0 +1,25 @@

+package clock

+

+import "time"

+

+type Timer interface {

+	C() <-chan time.Time

+	Reset(d time.Duration) bool

+	Stop() bool

+}

+

+type realTimer struct {

+	t *time.Timer

+}

+

+func (t *realTimer) C() <-chan time.Time {

+	return t.t.C

+}

+

+func (t *realTimer) Reset(d time.Duration) bool {

+	return t.t.Reset(d)

+}

+

+func (t *realTimer) Stop() bool {

+	return t.t.Stop()

+}

@@ -485,7 +485,7 @@ func (na *cnmNetworkAllocator) IsAttachmentAllocated(node *api.Node, networkAtta

 		return false

 	}

-	if networkAttachment == nil {

+	if networkAttachment == nil || networkAttachment.Network == nil {

 		return false

 	}

@@ -4,12 +4,12 @@ import (

 	"context"

 	"time"

+	"code.cloudfoundry.org/clock"

 	"github.com/docker/swarmkit/api"

 	"github.com/docker/swarmkit/log"

 	"github.com/docker/swarmkit/manager/state/raft"

 	"github.com/docker/swarmkit/manager/state/raft/membership"

 	"github.com/docker/swarmkit/manager/state/store"

-	"github.com/pivotal-golang/clock"

 )

 const (

@@ -11,6 +11,7 @@ import (

 	"sync/atomic"

 	"time"

+	"code.cloudfoundry.org/clock"

 	"github.com/coreos/etcd/pkg/idutil"

 	"github.com/coreos/etcd/raft"

 	"github.com/coreos/etcd/raft/raftpb"

@@ -28,7 +29,6 @@ import (

 	"github.com/docker/swarmkit/manager/state/store"

 	"github.com/docker/swarmkit/watch"

 	"github.com/gogo/protobuf/proto"

-	"github.com/pivotal-golang/clock"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/time/rate"

@@ -274,9 +274,10 @@ func (n *Node) currentRole() api.NodeRole {

 // configVXLANUDPPort sets vxlan port in libnetwork

 func configVXLANUDPPort(ctx context.Context, vxlanUDPPort uint32) {

 	if err := overlayutils.ConfigVXLANUDPPort(vxlanUDPPort); err != nil {

-		log.G(ctx).WithError(err).Error("Configuring VXLAN port failed")

+		log.G(ctx).WithError(err).Error("failed to configure VXLAN UDP port")

+		return

 	}

-	logrus.Infof(" Swarm successfully initialized VXLAN UDP Port to %d ", vxlanUDPPort)

+	logrus.Infof("initialized VXLAN UDP port to %d ", vxlanUDPPort)

 }

 func (n *Node) run(ctx context.Context) (err error) {

@@ -8,7 +8,7 @@

 # In >=1.11, those errors were brought back but the string had changed again.

 # After updating GRPC, if integration test failures occur, verify that the

 # string matching there is correct.

-google.golang.org/grpc v1.12.0

+google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2

 github.com/gogo/protobuf v1.0.0

 github.com/golang/protobuf v1.1.0

 github.com/matttproud/golang_protobuf_extensions v1.0.0

@@ -39,7 +39,7 @@ github.com/opencontainers/go-digest v1.0.0-rc1

 github.com/opencontainers/image-spec v1.0.1

 github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb

-github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 # v1.1.0

+github.com/davecgh/go-spew  8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1

 github.com/Microsoft/go-winio v0.4.11

 github.com/sirupsen/logrus v1.0.6

 github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceaf

@@ -52,15 +52,15 @@ github.com/hashicorp/go-memdb cb9a474f84cc5e41b273b20c6927680b2a8776ad

 github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3

 github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75

 github.com/phayes/permbits f7e3ac5e859d0b919c5068d581cc4c5d4f4f9bc5

-github.com/pivotal-golang/clock 3fd3c1944c59d9742e1cd333672181cd1a6f9fa0

+code.cloudfoundry.org/clock 02e53af36e6c978af692887ed449b74026d76fec

 github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d

-github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2

+github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0

 github.com/rcrowley/go-metrics 51425a2415d21afadfd55cd93432c0bc69e9598d

 github.com/spf13/cobra 8e91712f174ced10270cf66615e0a9127e7c4de5

 github.com/spf13/pflag 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7

-github.com/stretchr/testify v1.1.4

+github.com/stretchr/testify ffdc059bfe9ce6a4e144ba849dbedead332c6053 # v1.3.0

 go.etcd.io/bbolt v1.3.1-etcd.8

-golang.org/x/crypto 0709b304e793a5edb4a2c0145f281ecdc20838a4

+golang.org/x/crypto b7391e95e576cacdcdd422573063bc057239113d

 golang.org/x/net a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1

 golang.org/x/sys 90868a75fefd03942536221d7c0e2f84ec62a668

 golang.org/x/text f21a4dfb5e38f5895301dc265a8def02365cc3d0 # v0.3.0

deleted file mode 100644

@@ -1,202 +0,0 @@

-Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "{}"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright {yyyy} {name of copyright owner}

-

-   Licensed under the Apache License, Version 2.0 (the "License");

-   you may not use this file except in compliance with the License.

-   You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-   Unless required by applicable law or agreed to in writing, software

-   distributed under the License is distributed on an "AS IS" BASIS,

-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-   See the License for the specific language governing permissions and

-   limitations under the License.

-

deleted file mode 100644

@@ -1 +0,0 @@

-Provides a `Clock` interface, useful for injecting time dependencies in tests.

deleted file mode 100644

@@ -1,42 +0,0 @@

-package clock

-

-import "time"

-

-type Clock interface {

-	Now() time.Time

-	Sleep(d time.Duration)

-	Since(t time.Time) time.Duration

-

-	NewTimer(d time.Duration) Timer

-	NewTicker(d time.Duration) Ticker

-}

-

-type realClock struct{}

-

-func NewClock() Clock {

-	return &realClock{}

-}

-

-func (clock *realClock) Now() time.Time {

-	return time.Now()

-}

-

-func (clock *realClock) Since(t time.Time) time.Duration {

-	return time.Now().Sub(t)

-}

-

-func (clock *realClock) Sleep(d time.Duration) {

-	<-clock.NewTimer(d).C()

-}

-

-func (clock *realClock) NewTimer(d time.Duration) Timer {

-	return &realTimer{

-		t: time.NewTimer(d),

-	}

-}

-

-func (clock *realClock) NewTicker(d time.Duration) Ticker {

-	return &realTicker{

-		t: time.NewTicker(d),

-	}

-}

deleted file mode 100644

@@ -1,20 +0,0 @@

-package clock

-

-import "time"

-

-type Ticker interface {

-	C() <-chan time.Time

-	Stop()

-}

-

-type realTicker struct {

-	t *time.Ticker

-}

-

-func (t *realTicker) C() <-chan time.Time {

-	return t.t.C

-}

-

-func (t *realTicker) Stop() {

-	t.t.Stop()

-}

deleted file mode 100644

@@ -1,25 +0,0 @@

-package clock

-

-import "time"

-

-type Timer interface {

-	C() <-chan time.Time

-	Reset(d time.Duration) bool

-	Stop() bool

-}

-

-type realTimer struct {

-	t *time.Timer

-}

-

-func (t *realTimer) C() <-chan time.Time {

-	return t.t.C

-}

-

-func (t *realTimer) Reset(d time.Duration) bool {

-	return t.t.Reset(d)

-}

-

-func (t *realTimer) Stop() bool {

-	return t.t.Stop()

-}