Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / golang / protobuf / ptypes / duration.go

diff --git a/vendor/github.com/golang/protobuf/ptypes/duration.go b/vendor/github.com/golang/protobuf/ptypes/duration.go
index 65cb0f8eb5f33a710d674702ad7415a4b3f228c2..26d1ca2fb589ca8ec86382e171ec5a14deda4a6c 100644 (file)
--- a/vendor/github.com/golang/protobuf/ptypes/duration.go
+++ b/vendor/github.com/golang/protobuf/ptypes/duration.go
@@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) {
                return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
        }
        if p.Nanos != 0 {
-               d += time.Duration(p.Nanos)
+               d += time.Duration(p.Nanos) * time.Nanosecond
                if (d < 0) != (p.Nanos < 0) {
                        return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
                }