Merge pull request #12158 from fabianofranz/issues_11967

Merged by openshift-bot
openshift · Jan 14, 2017 · 13074d4 · 13074d4
2 parents b16b328 + 3fca1ac
commit 13074d4
Show file tree

Hide file tree

Showing 9 changed files with 427 additions and 448 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/...r/github.com/docker/go-units/LICENSE.code → vendor/github.com/docker/go-units/LICENSE b/...r/github.com/docker/go-units/LICENSE.code → vendor/github.com/docker/go-units/LICENSE
diff --git a/vendor/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/docker/go-units/LICENSE.docs
diff --git a/vendor/github.com/docker/go-units/README.md b/vendor/github.com/docker/go-units/README.md
diff --git a/vendor/github.com/docker/go-units/duration.go b/vendor/github.com/docker/go-units/duration.go
diff --git a/vendor/github.com/docker/go-units/duration_test.go b/vendor/github.com/docker/go-units/duration_test.go
diff --git a/vendor/github.com/docker/go-units/size.go b/vendor/github.com/docker/go-units/size.go
diff --git a/vendor/github.com/docker/go-units/size_test.go b/vendor/github.com/docker/go-units/size_test.go