From 7ad5d9a3112ffe52f4c80335d4c64d25dd6661be Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 10:38:51 +0100 Subject: [PATCH 1/6] README.md: Add short release note about Styx 1.0 API. --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 17930727ea..8c0811520d 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,18 @@ Styx is a programmable reverse proxy for JVM (Java Virtual Machine). It can be u as a stand-alone application, or as a platform to build custom networking applications. It is non-blocking, fully asynchronous and event driven therefore very scalable. +### A Quick Release Note + +New Styx 1.0 is coming soon. The `master` branch is now following a bleeding edge, +soon to be released Styx 1.0. + +Styx 0.7 code is in `styx-0.7` branch. It is in maintenance mode and will be receiving +bug fixes only. + +Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for latest developments. + +### Features + Styx Proxies HTTP requests to a configurable set of *Backend Services* typically a cluster of web servers (multiple origins) or load balancers (e.g. AWS ELB). From 60649ea56090ab6b60dcc53901fff9991718ad49 Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 11:38:58 +0100 Subject: [PATCH 2/6] Improve wording. --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8c0811520d..19a3ae9e23 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,13 @@ Styx is a programmable reverse proxy for JVM (Java Virtual Machine). It can be u as a stand-alone application, or as a platform to build custom networking applications. It is non-blocking, fully asynchronous and event driven therefore very scalable. -### A Quick Release Note +### Upcoming Release Note + [Styx 1.0](https://github.com/HotelsDotCom/styx/wiki/Styx-1.0-API) is coming to + public release soon. `master` is now following bleeding edge for Styx 1.0. + Styx 0.7 code is available in `styx-0.7` branch which is in maintenance + mode for bug fixes only. Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) + for latest developments. -New Styx 1.0 is coming soon. The `master` branch is now following a bleeding edge, -soon to be released Styx 1.0. - -Styx 0.7 code is in `styx-0.7` branch. It is in maintenance mode and will be receiving -bug fixes only. - -Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for latest developments. ### Features From 8d5a748f4792a95bb0ce55ea5799588e7e87e795 Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 11:50:12 +0100 Subject: [PATCH 3/6] Improve formatting. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 19a3ae9e23..9baccde9f3 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,12 @@ as a stand-alone application, or as a platform to build custom networking applic It is non-blocking, fully asynchronous and event driven therefore very scalable. ### Upcoming Release Note - [Styx 1.0](https://github.com/HotelsDotCom/styx/wiki/Styx-1.0-API) is coming to - public release soon. `master` is now following bleeding edge for Styx 1.0. - Styx 0.7 code is available in `styx-0.7` branch which is in maintenance - mode for bug fixes only. Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) - for latest developments. +[Styx 1.0](https://github.com/HotelsDotCom/styx/wiki/Styx-1.0-API) is coming to +public release soon. `master` is now following bleeding edge for Styx 1.0. +Styx 0.7 code is available in `styx-0.7` branch which is in maintenance +mode for bug fixes only. Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) +for latest developments. ### Features From 78a10d0b7331ce15ef428e8391c508e47ac1bbc3 Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 12:41:08 +0100 Subject: [PATCH 4/6] Tidy up. --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9baccde9f3..1eb59e2c09 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,9 @@ It is non-blocking, fully asynchronous and event driven therefore very scalable. ### Upcoming Release Note -[Styx 1.0](https://github.com/HotelsDotCom/styx/wiki/Styx-1.0-API) is coming to -public release soon. `master` is now following bleeding edge for Styx 1.0. -Styx 0.7 code is available in `styx-0.7` branch which is in maintenance -mode for bug fixes only. Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) -for latest developments. +Styx 1.0 will be publicly released soon. The `master` is now the bleeding edge for Styx 1.0. +Styx 0.7 code is available in the `styx-0.7` branch which is in maintenance mode (bug fixes only). +Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for latest developments. ### Features From 732c63f30830be5fd4fe897108df181e5af38212 Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 12:45:57 +0100 Subject: [PATCH 5/6] Fix typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1eb59e2c09..f63aeabb15 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ It is non-blocking, fully asynchronous and event driven therefore very scalable. Styx 1.0 will be publicly released soon. The `master` is now the bleeding edge for Styx 1.0. Styx 0.7 code is available in the `styx-0.7` branch which is in maintenance mode (bug fixes only). -Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for latest developments. +Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for the latest developments. ### Features From 9431deea0841d17716d5c4976215ae5a1654731e Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 30 Aug 2018 13:39:33 +0100 Subject: [PATCH 6/6] Add hyperlink to styx-1.0-release wiki. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f63aeabb15..8fab5b4c53 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It is non-blocking, fully asynchronous and event driven therefore very scalable. ### Upcoming Release Note -Styx 1.0 will be publicly released soon. The `master` is now the bleeding edge for Styx 1.0. +[Styx 1.0](https://github.com/HotelsDotCom/styx/wiki/Styx-1.0-Release) will be publicly released soon. The `master` is now the bleeding edge for Styx 1.0. Styx 0.7 code is available in the `styx-0.7` branch which is in maintenance mode (bug fixes only). Follow the [Styx Wiki](https://github.com/HotelsDotCom/styx/wiki) for the latest developments.