diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcb6fe65a0..9359910761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,13 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
+## [1.0.2](https://github.com/opsmill/infrahub/tree/v1.0.2) - 2024-11-06
+
+### Fixed
+
+- Update branch merge logic to use smaller queries outside of a transaction to allow merging a branch with many changes ([#4448](https://github.com/opsmill/infrahub/issues/4448))
+- Ensure the GraphQL query InfrahubResourcePoolUtilization works properly when the schema is different in the branch ([#4761](https://github.com/opsmill/infrahub/issues/4761))
+
## [1.0.1](https://github.com/opsmill/infrahub/tree/v1.0.1) - 2024-10-31
### Fixed
diff --git a/changelog/4448.fixed.md b/changelog/4448.fixed.md
deleted file mode 100644
index f9ea9ce2d9..0000000000
--- a/changelog/4448.fixed.md
+++ /dev/null
@@ -1 +0,0 @@
-Update branch merge logic to use smaller queries outside of a transaction to allow merging a branch with many changes
\ No newline at end of file
diff --git a/changelog/4761.fixed.md b/changelog/4761.fixed.md
deleted file mode 100644
index 581682529f..0000000000
--- a/changelog/4761.fixed.md
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the GraphQL query InfrahubResourcePoolUtilization works properly when the schema is different in the branch
\ No newline at end of file
diff --git a/docs/docs/release-notes/infrahub/release-1_0.mdx b/docs/docs/release-notes/infrahub/release-1_0.mdx
index 77a9a6f994..7565539eb0 100644
--- a/docs/docs/release-notes/infrahub/release-1_0.mdx
+++ b/docs/docs/release-notes/infrahub/release-1_0.mdx
@@ -224,7 +224,7 @@ Please ensure you have a **backup of your Infrahub environment** prior to attemp
Below are some example ways to get the latest version of Infrahub in your environment.
- For deployments via Docker Compose, update your container version by updating the `IMAGE_VER` environment variable and relaunch:
- - `export IMAGE_VER="1.0.0"; docker compose pull && docker compose up -d`
+ - `export VERSION="1.0.0"; docker compose pull && docker compose up -d`
- For deployments via Kubernetes, utilize the latest version of the Helm chart supplied with this release
**Second**, once you have gotten the desired version of Infrahub in your environment, please run the following commands.
diff --git a/docs/docs/release-notes/infrahub/release-1_0_1.mdx b/docs/docs/release-notes/infrahub/release-1_0_1.mdx
index 3d5ca47f61..cf816f7127 100644
--- a/docs/docs/release-notes/infrahub/release-1_0_1.mdx
+++ b/docs/docs/release-notes/infrahub/release-1_0_1.mdx
@@ -51,7 +51,7 @@ Please ensure you have a **backup of your Infrahub environment** prior to attemp
Below are some example ways to get the latest version of Infrahub in your environment.
- For deployments via Docker Compose, update your container version by updating the `IMAGE_VER` environment variable and relaunch:
- - `export IMAGE_VER="1.0.0"; docker compose pull && docker compose up -d`
+ - `export VERSION="1.0.1"; docker compose pull && docker compose up -d`
- For deployments via Kubernetes, utilize the latest version of the Helm chart supplied with this release
**Second**, once you have gotten the desired version of Infrahub in your environment, please run the following commands.
diff --git a/docs/docs/release-notes/infrahub/release-1_0_2.mdx b/docs/docs/release-notes/infrahub/release-1_0_2.mdx
new file mode 100644
index 0000000000..3ec643042e
--- /dev/null
+++ b/docs/docs/release-notes/infrahub/release-1_0_2.mdx
@@ -0,0 +1,86 @@
+---
+title: Release 1.0.2
+---
+
+
+# Release 1.0.2
+
+This is a bug-fix release to address issues found in Infrahub v1.0.1.
+
+## Main changes
+
+The complete list of changes can always be found in the `CHANGELOG.md` file in the Infrahub Git repository.
+
+### Fixed
+
+- Update branch merge logic to use smaller queries outside of a transaction to allow merging a branch with many changes ([#4448](https://github.com/opsmill/infrahub/issues/4448))
+- Ensure the GraphQL query InfrahubResourcePoolUtilization works properly when the schema is different in the branch ([#4761](https://github.com/opsmill/infrahub/issues/4761))
+
+## Migration guide
+
+The process to migrate your instance of Infrahub to the latest version may vary depending on your deployment of Infrahub.
+However, at a high-level, it will involve getting the latest version of the Infrahub code, and then performing any needed Database Migrations and Schema updates.
+
+Please ensure you have a **backup of your Infrahub environment** prior to attempting any migration or upgrade activities.
+
+### Migration of an Infrahub instance
+
+**First**, update the Infrahub version running in your environment.
+
+Below are some example ways to get the latest version of Infrahub in your environment.
+
+- For deployments via Docker Compose, update your container version by updating the `IMAGE_VER` environment variable and relaunch:
+ - `export VERSION="1.0.2"; docker compose pull && docker compose up -d`
+- For deployments via Kubernetes, utilize the latest version of the Helm chart supplied with this release
+
+**Second**, once you have gotten the desired version of Infrahub in your environment, please run the following commands.
+
+> Note: If you are running Infrahub in Docker/K8s, these commands need to run from a container where Infrahub is installed.
+
+```shell
+infrahub db migrate
+infrahub db update-core-schema
+```
+
+**Finally**, restart all instances of Infrahub.
+
+### Migration of a dev or demo instance
+
+If you are using the `dev` or `demo` environments, we have provided `invoke` commands to aid in the migration to the latest version.
+The below examples provide the `demo` version of the commands, however similar commands can be used for `dev` as well.
+
+```shell
+invoke demo.stop
+invoke demo.build
+invoke demo.migrate
+invoke demo.start
+```
+
+If you don't want to keep your data, you can start a clean instance with the following command.
+
+> **Warning: All data will be lost, please make sure to backup everything you need before running this command.**
+
+```shell
+invoke demo.destroy demo.build demo.start demo.load-infra-schema demo.load-infra-data
+```
+
+The repository https://github.com/opsmill/infrahub-demo-edge has also been updated, it's recommended to pull the latest changes into your fork.
\ No newline at end of file
diff --git a/docs/docs/release-notes/infrahub/release-1_0_2-DRAFT.mdx b/docs/docs/release-notes/infrahub/release-1_0_3-DRAFT.mdx
similarity index 95%
rename from docs/docs/release-notes/infrahub/release-1_0_2-DRAFT.mdx
rename to docs/docs/release-notes/infrahub/release-1_0_3-DRAFT.mdx
index dc9de6f7bd..892d155784 100644
--- a/docs/docs/release-notes/infrahub/release-1_0_2-DRAFT.mdx
+++ b/docs/docs/release-notes/infrahub/release-1_0_3-DRAFT.mdx
@@ -1,5 +1,5 @@
---
-title: Release 1.0.2 - DEVELOPMENT
+title: Release 1.0.3 - DEVELOPMENT
---
@@ -22,7 +22,7 @@ title: Release 1.0.2 - DEVELOPMENT
-# Release 1.0.2
+# Release 1.0.3
## Main changes
@@ -48,7 +48,7 @@ Please ensure you have a **backup of your Infrahub environment** prior to attemp
Below are some example ways to get the latest version of Infrahub in your environment.
- For deployments via Docker Compose, update your container version by updating the `IMAGE_VER` environment variable and relaunch:
- - `export IMAGE_VER="1.0.0"; docker compose pull && docker compose up -d`
+ - `export VERSION="1.0.3"; docker compose pull && docker compose up -d`
- For deployments via Kubernetes, utilize the latest version of the Helm chart supplied with this release
**Second**, once you have gotten the desired version of Infrahub in your environment, please run the following commands.
diff --git a/docs/sidebars.ts b/docs/sidebars.ts
index 6dc2cb0756..82409c6f4d 100644
--- a/docs/sidebars.ts
+++ b/docs/sidebars.ts
@@ -311,7 +311,8 @@ const sidebars: SidebarsConfig = {
slug: 'release-notes/infrahub',
},
items: [
- // 'release-notes/infrahub/release-1_0_2-DRAFT',
+ // 'release-notes/infrahub/release-1_0_3-DRAFT',
+ 'release-notes/infrahub/release-1_0_2',
'release-notes/infrahub/release-1_0_1',
'release-notes/infrahub/release-1_0',
'release-notes/infrahub/release-0_16_4',
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index f5f12bbb5b..65a480e15e 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -15,12 +15,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.1
+version: 3.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-appVersion: "1.0.1"
+appVersion: "1.0.2"
dependencies:
- name: neo4j
diff --git a/pyproject.toml b/pyproject.toml
index f709676f85..a0061b1873 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "infrahub-server"
-version = "1.0.1"
+version = "1.0.2"
description = "Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run."
authors = ["OpsMill "]
readme = "README.md"