Merge pull request #1792 from carolynvs/bump-semver

Bump github.com/Masterminds/semver
golang · Apr 3, 2018 · cac6a19 · cac6a19
2 parents 103c775 + 310cf24
commit cac6a19
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ IMPROVEMENTS:
 ([#1549](https://github.com/golang/dep/pull/1549)).
 * Reduce network access by trusting local source information and only pulling
 from upstream when necessary ([#1250](https://github.com/golang/dep/pull/1250)).
+* Update our dependency on Masterminds/semver to follow upstream again now that [Masterminds/semver#67](https://github.com/Masterminds/semver/pull/67) is merged([#1792](https://github.com/golang/dep/pull/1792)).
 
 WIP:
 * Enable importing external configuration from dependencies during init (#1277). This

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,8 +1,6 @@
-# https://github.com/Masterminds/semver/pull/60
 [[constraint]]
   name = "github.com/Masterminds/semver"
-  source = "https://github.com/carolynvs/semver.git"
-  branch = "parse-constraints-with-dash-in-pre"
+  branch = "2.x"
 
 [[constraint]]
   name = "github.com/Masterminds/vcs"

diff --git a/vendor/github.com/Masterminds/semver/constraints.go b/vendor/github.com/Masterminds/semver/constraints.go
diff --git a/vendor/github.com/Masterminds/semver/parse.go b/vendor/github.com/Masterminds/semver/parse.go