Skip to content

Commit

Permalink
Merge pull request #241 from Shopify/v2.1.4
Browse files Browse the repository at this point in the history
Bump to v2.1.4
  • Loading branch information
jpittis authored Jan 22, 2019
2 parents 7eb6f30 + 49b4ea2 commit 07d7b63
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 2.1.4

* Bug fix: Fix OOM in toxic. #232
* Documentation updates.
* CI and test updates.

# 2.1.3

* Update `/version` endpoint to also return a charset of utf-8. #204
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ binaries and system packages for your architecture.
**Ubuntu**

```bash
$ wget -O toxiproxy-2.1.3.deb https://github.com/Shopify/toxiproxy/releases/download/v2.1.3/toxiproxy_2.1.3_amd64.deb
$ sudo dpkg -i toxiproxy-2.1.3.deb
$ wget -O toxiproxy-2.1.4.deb https://github.com/Shopify/toxiproxy/releases/download/v2.1.4/toxiproxy_2.1.4_amd64.deb
$ sudo dpkg -i toxiproxy-2.1.4.deb
$ sudo service toxiproxy start
```

Expand All @@ -214,7 +214,7 @@ $ brew install toxiproxy

**Windows**

Toxiproxy for Windows is available for download at https://github.com/Shopify/toxiproxy/releases/download/v2.1.3/toxiproxy-server-windows-amd64.exe
Toxiproxy for Windows is available for download at https://github.com/Shopify/toxiproxy/releases/download/v2.1.4/toxiproxy-server-windows-amd64.exe

**Docker**

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.3
2.1.4

0 comments on commit 07d7b63

Please sign in to comment.