diff options
| author | Andrew Newdigate <andrew@troupe.co> | 2017-06-07 15:54:30 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@troupe.co> | 2017-06-07 15:54:30 +0300 |
| commit | f328c167c3db92344a4f4502d8702250a48386cb (patch) | |
| tree | cd7f2166778280f08aa899a2eec374b22dda4aa8 | |
| parent | d8b1538d9d10bfdaea6e20319bb71f0ed806175e (diff) | |
| parent | 2ea32f2457426f69954ebd12a4d3f9c27a16fe40 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitaly into logging-fixes
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | doc/release.md | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 737652798..6b1986211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Gitaly changelog -UNRELEASED +v0.11.0 - FindDefaultBranchName: decorate error https://gitlab.com/gitlab-org/gitaly/merge_requests/148 @@ -29,6 +29,7 @@ UNRELEASED - CommitDiff: Send chunks of patches over messages https://gitlab.com/gitlab-org/gitaly/merge_requests/170 - Upgrade gRPC and its dependencies + https://gitlab.com/gitlab-org/gitaly/merge_requests/180 v0.10.0 @@ -1 +1 @@ -0.10.0 +0.11.0 diff --git a/doc/release.md b/doc/release.md index 0035d6442..63e496385 100644 --- a/doc/release.md +++ b/doc/release.md @@ -1,9 +1,7 @@ # Gitaly release process - Pick a release number (x.y.z) -- Create a CHANGELOG.md entry for x.y.z (use a merge request) - Check out the master branch on your local machine -- Verify that the CHANGELOG for x.y.z is there - run `_support/release x.y.z` Where x.y.z is a semver-compliant version number. |