Release 1.5.0 (googleforgames#1473)

Tweaked the ordering in the release checklist closer to what I usually do as well.
ilkercelikyilmaz · Oct 23, 2020 · f8665c7 · f8665c7
1 parent 260fc74
commit f8665c7
Show file tree

Hide file tree

Showing 11 changed files with 504 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+<<<<<<< HEAD
 ## [v1.9.0](https://github.com/googleforgames/agones/tree/v1.9.0) (2020-09-29)
 
 [Full Changelog](https://github.com/googleforgames/agones/compare/v1.9.0-rc...v1.9.0)
@@ -439,6 +440,8 @@
 - Enhance Logs readability of  SDK Conformance Tests [\#1453](https://github.com/googleforgames/agones/pull/1453) ([aLekSer](https://github.com/aLekSer))
 - Update to OpenCensus version 0.22.3 [\#1446](https://github.com/googleforgames/agones/pull/1446) ([aLekSer](https://github.com/aLekSer))
 
+=======
+>>>>>>> a5e1e34b (Release 1.5.0 (#1473))
 ## [v1.5.0](https://github.com/googleforgames/agones/tree/v1.5.0) (2020-04-14)
 
 [Full Changelog](https://github.com/googleforgames/agones/compare/v1.5.0-rc...v1.5.0)
@@ -461,7 +464,10 @@
 
 **Merged pull requests:**
 
+<<<<<<< HEAD
 - Release 1.5.0 [\#1473](https://github.com/googleforgames/agones/pull/1473) ([markmandel](https://github.com/markmandel))
+=======
+>>>>>>> a5e1e34b (Release 1.5.0 (#1473))
 - Website: A number of corrections in the docs [\#1466](https://github.com/googleforgames/agones/pull/1466) ([aLekSer](https://github.com/aLekSer))
 - Website: Fix path in swagger command [\#1462](https://github.com/googleforgames/agones/pull/1462) ([aLekSer](https://github.com/aLekSer))
 - Use go modules for a website and update go version [\#1457](https://github.com/googleforgames/agones/pull/1457) ([aLekSer](https://github.com/aLekSer))

diff --git a/install/helm/agones/Chart.yaml b/install/helm/agones/Chart.yaml
@@ -15,8 +15,13 @@
 # Declare variables to be passed into your templates.
 
 apiVersion: v1
+<<<<<<< HEAD
 appVersion: "1.10.0-dev"
 version: 1.10.0-dev
+=======
+appVersion: "1.5.0"
+version: 1.5.0
+>>>>>>> a5e1e34b (Release 1.5.0 (#1473))
 name: agones
 description: a library for hosting, running and scaling dedicated game servers on Kubernetes.
 keywords:

diff --git a/install/helm/agones/values.yaml b/install/helm/agones/values.yaml
@@ -142,7 +142,11 @@ agones:
     totalRemoteAllocationTimeout: 30s
   image:
     registry: gcr.io/agones-images
+<<<<<<< HEAD
     tag: 1.10.0-dev
+=======
+    tag: 1.5.0
+>>>>>>> a5e1e34b (Release 1.5.0 (#1473))
     controller:
       name: agones-controller
       pullPolicy: IfNotPresent