commit 95640783f8bb1ab725a246e05aaf642b5ed63429
author Luca Milanesio <luca.milanesio@gmail.com> Mon May 23 22:34:27 2022 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Mon May 23 22:34:27 2022 +0100
tree e6e47bef058c958d5121fd444be138daec86c4f9
parent f087db04f52d1ecd794737596291b3d03f097131
parent 186f8cade43d5f0e0d3e13486e735f84bb2af965

Merge branch 'stable-3.5'

* stable-3.5:
  Set Gerrit to 3.5.2
  Set Gerrit to 3.4.5

Change-Id: I4a77e8529848592a5c79b7d6df25b2d356fb4f42

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index de3d8e9..79994c8 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,9 +1,9 @@
-VERSION=3.5.2
-WAR_VERSION=3.5.2
-BRANCH=stable-3.5
+VERSION=3.6.0
+WAR_VERSION=3.6.0-rc5
+BRANCH=stable-3.6
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
-RELEASE=1
+RELEASE=0rc5
 
 NAME=gerrit
 CATEGORY=Development

macOS/Makefile

diff --git a/macOS/Makefile b/macOS/Makefile
index d1fb8b6..4ec2ec6 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.5.2
+VERSION := 3.6.0-rc5
 
 all: server