Prepare for 2.12.1 patch release (#1524 )

* Update license date * Add override version
Merge master into release/2.12
2023-11-17 08:17:43 -05:00 · 2023-11-17 11:30:40 +01:00 · 2023-10-31 19:22:52 +01:00 · 2023-10-31 19:18:05 +01:00 · 2023-10-31 19:13:55 +01:00 · 2023-10-31 18:13:10 +01:00
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ option(MG_ENTERPRISE "Build Memgraph Enterprise Edition" ON)
 # Set the current version here to override the automatic version detection. The
 # version must be specified as `X.Y.Z`. Primarily used when building new patch
 # versions.
-set(MEMGRAPH_OVERRIDE_VERSION "")
+set(MEMGRAPH_OVERRIDE_VERSION "2.12.1")

 # Custom suffix that this version should have. The suffix can be any arbitrary
 # string. Primarily used when building a version for a specific customer.
--- a/licenses/BSL.txt
+++ b/licenses/BSL.txt
@@ -36,7 +36,7 @@ ADDITIONAL USE GRANT:   You may use the Licensed Work in accordance with the
                        3. using the Licensed Work to create a work or solution
                        which competes (or might reasonably be expected to
                        compete) with the Licensed Work.
-CHANGE DATE:            2027-30-10
+CHANGE DATE:            2027-17-11
 CHANGE LICENSE:         Apache License, Version 2.0

 For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.
Author	SHA1	Message	Date
Marko Barišić	da9d6dd8e1	Prepare for 2.12.1 patch release (#1524 ) * Update license date * Add override version	2023-11-17 08:17:43 -05:00
Deda	a65a30cfc5	Merge master into release/2.12	2023-11-17 11:30:40 +01:00
Deda	b2de962a3f	Add step to run.sh which deletes /memgraph from builder before copy	2023-10-31 19:22:52 +01:00
Deda	68e79bdaf4	Fix run.sh	2023-10-31 19:18:05 +01:00
Deda	7ee44ae484	Add git clean step to run.sh	2023-10-31 19:13:55 +01:00
Deda	0e0f8fe231	Revert timeout for arm builds back to 120 minutes	2023-10-31 18:13:10 +01:00
Deda	390fc98379	Fix timeout for arm package all builds and nodejs dependency issue for amazon linux 2	2023-10-31 13:04:37 +01:00