merge from master

4dn-dcic · Aug 20, 2024 · 6f3a3f6 · 6f3a3f6
2 parents 799037a + 4d98773
commit 6f3a3f6
Show file tree

Hide file tree

Showing 3 changed files with 346 additions and 37 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,12 +6,19 @@
 Change Log
 ----------
 
-4.2.1
+4.4.0
 =====
 
 * Update some versions.
-* Change to base.py to allow s3_encrypt_key.txt file to alternatively live directly
-  in the custom directory rather than in the custom/aws_creds directory.
+* Change to base.py to allow s3_encrypt_key.txt file to alternatively live
+  directly in the custom directory rather than in the custom/aws_creds directory;
+  simplifies the way I (dmichaels) want to organize my environment.
+
+
+4.3.0
+=====
+
+* Implements identity swap procedure for SMaHT, including autoscaling configuration
 
 
 4.2.0

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "4dn-cloud-infra"
-version = "4.2.1"
+version = "4.3.0.1b1"  # TODO: To become 4.4.0
 description = "Repository for generating Cloudformation Templates to orchestrate the CGAP Ecosystem"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"