From ea2a56024cc6cd41d37cdbcff182f0565cf94305 Mon Sep 17 00:00:00 2001 From: Erik Kieckhafer Date: Thu, 19 Dec 2019 15:09:31 -0800 Subject: [PATCH 1/2] Revert "chore: release v3.0.0-alpha" Signed-off-by: Erik Kieckhafer --- CHANGELOG.md | 7 ------- config.mk | 9 +++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05b6751..8e23406 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,3 @@ -# v3.0.0-alpha - -This is a major update to keep this project in sync with -[reaction v3.0.0-alpha](https://github.com/reactioncommerce/reaction), -[example-storefront v3.0.0-alpha](https://github.com/reactioncommerce/example-storefront), -and [reaction-platform v3.0.0-alpha](https://github.com/reactioncommerce/reaction-platform). - # v2.9.0 This is minor version update coordinated with [Reaction](https://github.com/reactioncommerce/reaction), our [Example Storefront](https://github.com/reactioncommerce/example-storefront) and [reaction-hydra](https://github.com/reactioncommerce/reaction-hydra). diff --git a/config.mk b/config.mk index bfc81e5..21235cc 100644 --- a/config.mk +++ b/config.mk @@ -27,16 +27,13 @@ endef # TAG is the git tag or branch to checkout # Projects will be started in this order define SUBPROJECT_REPOS -git@github.com:/reactioncommerce/example-storefront.git,example-storefront,v3.0.0-alpha \ -git@github.com:/reactioncommerce/reaction-admin.git,reaction-admin,v3.0.0-alpha \ -git@github.com:/reactioncommerce/reaction-hydra.git,reaction-hydra,v3.0.0-alpha \ -git@github.com:/reactioncommerce/reaction-identity.git,reaction-identity,v3.0.0-alpha \ -git@github.com:/reactioncommerce/reaction.git,reaction,v3.0.0-alpha +git@github.com:/reactioncommerce/reaction-hydra.git,reaction-hydra,v2.9.0 \ +git@github.com:/reactioncommerce/reaction.git,reaction,v2.9.0 \ +git@github.com:/reactioncommerce/example-storefront.git,example-storefront,v2.9.0 endef # List of user defined networks that should be created. define DOCKER_NETWORKS -reaction.localhost \ auth.reaction.localhost \ api.reaction.localhost \ streams.reaction.localhost From f07a00770027ab1e8c3eab50240b85ad09658f88 Mon Sep 17 00:00:00 2001 From: Erik Kieckhafer Date: Thu, 19 Dec 2019 16:06:22 -0800 Subject: [PATCH 2/2] chore: update changelog and config for v2.9.1 Signed-off-by: Erik Kieckhafer --- CHANGELOG.md | 3 +++ config.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e23406..6a0abdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v2.9.1 +This is patch version update coordinated with [Reaction](https://github.com/reactioncommerce/reaction), our [Example Storefront](https://github.com/reactioncommerce/example-storefront) and [reaction-hydra](https://github.com/reactioncommerce/reaction-hydra). + # v2.9.0 This is minor version update coordinated with [Reaction](https://github.com/reactioncommerce/reaction), our [Example Storefront](https://github.com/reactioncommerce/example-storefront) and [reaction-hydra](https://github.com/reactioncommerce/reaction-hydra). diff --git a/config.mk b/config.mk index 21235cc..ced14c1 100644 --- a/config.mk +++ b/config.mk @@ -27,9 +27,9 @@ endef # TAG is the git tag or branch to checkout # Projects will be started in this order define SUBPROJECT_REPOS -git@github.com:/reactioncommerce/reaction-hydra.git,reaction-hydra,v2.9.0 \ -git@github.com:/reactioncommerce/reaction.git,reaction,v2.9.0 \ -git@github.com:/reactioncommerce/example-storefront.git,example-storefront,v2.9.0 +git@github.com:/reactioncommerce/reaction-hydra.git,reaction-hydra,v2.9.1 \ +git@github.com:/reactioncommerce/reaction.git,reaction,v2.9.1 \ +git@github.com:/reactioncommerce/example-storefront.git,example-storefront,v2.9.1 endef # List of user defined networks that should be created.