diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-06-17 09:08:46 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 09:08:46 +1200 |
| commit | 9113dabb32f3e9a966826c3394603a238b9cb1a3 (patch) | |
| tree | ae0404e8abb19afa2f829fe286dcbd51572d51c8 | |
| parent | 62d0d3db63911f6293cd2ff31a390e00ed94e492 (diff) | |
| parent | 58c93a233b5fbdb7b0107a4fc045a71cee9f0ead (diff) | |
| download | mitmproxy-9113dabb32f3e9a966826c3394603a238b9cb1a3.tar.gz mitmproxy-9113dabb32f3e9a966826c3394603a238b9cb1a3.tar.bz2 mitmproxy-9113dabb32f3e9a966826c3394603a238b9cb1a3.zip | |
Merge pull request #3207 from cortesi/postrelease
CHANGELOG, release/README updates
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | release/README.md | 7 |
2 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ -15 June 2018: mitmproxy 4.0.2 +15 June 2018: mitmproxy 4.0.3 * Add support for IPv6 transparent mode on Windows (#3174) * Add Docker images for ARMv7 - Raspberry Pi (#3190) @@ -8,6 +8,10 @@ * Fix IPv6 scope suffixes in block addon (#3164) * Fix options update when added (#3157) * Fix "Edit Flow" button in mitmweb (#3136) + +15 June 2018: mitmproxy 4.0.2 + * Skipped! + 17 May 2018: mitmproxy 4.0.1 diff --git a/release/README.md b/release/README.md index 14d7f433..6f4e8f1a 100644 --- a/release/README.md +++ b/release/README.md @@ -7,14 +7,11 @@ release for! The command examples assume that you have a git remote called - Verify that `mitmproxy/version.py` is correct - Update CHANGELOG - Verify that all CI tests pass -- Create a major version branch - e.g. `v4.x`. Assuming you have a remote repo called `upstream` that points to the mitmproxy/mitmproxy repo:: +- If needed, create a major version branch - e.g. `v4.x`. Assuming you have a remote repo called `upstream` that points to the mitmproxy/mitmproxy repo:: - `git checkout -b v4.x upstream/master` - `git push -u upstream v4.x` - Tag the release and push to Github - - For alphas, betas, and release candidates, use lightweight tags. This is - necessary so that the .devXXXX counter does not reset. - - For final releases, use annotated tags. This makes the .devXXXX counter reset. - - `git tag -a v4.0.0 -m v4.0.0` + - `git tag v4.0.0` - `git push upstream v4.0.0` - Wait for tag CI to complete |