From 28791d6260f432574c4ac1819f9c15e4f4e5da58 Mon Sep 17 00:00:00 2001
From: CI Bot <ci@starkandwayne.com>
Date: Mon, 19 Aug 2019 14:29:04 +0000
Subject: [PATCH] release v9.7.0

---
 .final_builds/jobs/haproxy/index.yml |  4 +++
 ci/release_notes.md                  | 13 ----------
 manifests/haproxy.yml                |  6 ++---
 releases/haproxy/haproxy-9.7.0.yml   | 38 ++++++++++++++++++++++++++++
 releases/haproxy/index.yml           |  2 ++
 5 files changed, 47 insertions(+), 16 deletions(-)
 delete mode 100644 ci/release_notes.md
 create mode 100644 releases/haproxy/haproxy-9.7.0.yml

diff --git a/.final_builds/jobs/haproxy/index.yml b/.final_builds/jobs/haproxy/index.yml
index d71586f0..dae22932 100644
--- a/.final_builds/jobs/haproxy/index.yml
+++ b/.final_builds/jobs/haproxy/index.yml
@@ -51,6 +51,10 @@ builds:
     version: 609a877093630e79ecc882a2b4d27bb6b3daa52f
     blobstore_id: 02960fd7-770a-4299-86f5-1f8e00b84052
     sha1: f2486ceaaefc4a058d04e6e5ee60225c8f8d52f6
+  66b2ff3874813bd53141bfd0ef7f1d9fcf70b6b54e7748a1df29895d6c43945b:
+    version: 66b2ff3874813bd53141bfd0ef7f1d9fcf70b6b54e7748a1df29895d6c43945b
+    blobstore_id: 610b391d-a23a-4fcf-4c3c-1773b8056679
+    sha1: sha256:f7586335b69301a4e68f5d286b486529f8fb567bdaed941cb4c832e23f2670c0
   6b4501595bcdf67bc9cb8eea1a203a8226160aea:
     version: 6b4501595bcdf67bc9cb8eea1a203a8226160aea
     blobstore_id: cf3ea12e-0b26-442a-9212-ded03e8fca1f
diff --git a/ci/release_notes.md b/ci/release_notes.md
deleted file mode 100644
index c53e177d..00000000
--- a/ci/release_notes.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# New Features
-
-- Syslog length and format can now be configured via `ha_proxy.log_max_length` and `ha_proxy.log_format`.
-  Defaults remain unchanged at 1024 bytes, and rfc3164.
-
-- HAProxy can now bind to the default interface on both IPv4 and IPv6 simultaneously, via the `ha_proxy.v4v6`
-  property. When this is set, you must also set the `ha_proxy.binding_ip` to `::` for it to take effect. This
-  feature is off by default.
-
-
-# Acknowledgements
-
-Thanks go to @cunnie for the IPv6 binding, and @msahihi for the log customization PRs!
diff --git a/manifests/haproxy.yml b/manifests/haproxy.yml
index cd39367c..36bb3aa9 100644
--- a/manifests/haproxy.yml
+++ b/manifests/haproxy.yml
@@ -38,6 +38,6 @@ releases:
 - name: bpm
   version: latest
 - name: haproxy
-  version: 9.6.2
-  url: https://github.com/cloudfoundry-incubator/haproxy-boshrelease/releases/download/v9.6.2/haproxy-9.6.2.tgz
-  sha1: f4c80edae5e8655f21501c34f7fe9482b581be64
+  version: 9.7.0
+  url: https://github.com/cloudfoundry-incubator/haproxy-boshrelease/releases/download/v9.7.0/haproxy-9.7.0.tgz
+  sha1: 8afcfb2d22b244477de5dcba40e9c11d58b376ad
diff --git a/releases/haproxy/haproxy-9.7.0.yml b/releases/haproxy/haproxy-9.7.0.yml
new file mode 100644
index 00000000..e54a13d5
--- /dev/null
+++ b/releases/haproxy/haproxy-9.7.0.yml
@@ -0,0 +1,38 @@
+name: haproxy
+version: 9.7.0
+commit_hash: 1ef53d2
+uncommitted_changes: false
+jobs:
+- name: haproxy
+  version: 66b2ff3874813bd53141bfd0ef7f1d9fcf70b6b54e7748a1df29895d6c43945b
+  fingerprint: 66b2ff3874813bd53141bfd0ef7f1d9fcf70b6b54e7748a1df29895d6c43945b
+  sha1: sha256:f7586335b69301a4e68f5d286b486529f8fb567bdaed941cb4c832e23f2670c0
+  packages:
+  - haproxy
+  - ttar
+- name: keepalived
+  version: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a
+  fingerprint: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a
+  sha1: sha256:92d8f1996f108950d19400fb0af33350892599b3f921a0a81f7baebacacc11fb
+  packages:
+  - keepalived
+packages:
+- name: haproxy
+  version: 6c01e30bb6656dbf35a8601328ecfdf7cae7aaf6f3c7e896e48d3ad86b97c827
+  fingerprint: 6c01e30bb6656dbf35a8601328ecfdf7cae7aaf6f3c7e896e48d3ad86b97c827
+  sha1: sha256:0188e27e6fb39ca3997ccc5a113f455145c9fab99c97fcfc4c81d1927fb3b17b
+  dependencies: []
+- name: keepalived
+  version: 14aa689351e2083295d9f29e17330f15c4b21e775773f3e1f393395b212dd733
+  fingerprint: 14aa689351e2083295d9f29e17330f15c4b21e775773f3e1f393395b212dd733
+  sha1: sha256:77ff9d693c9398cc73319e6a5ffdfb96215c90a04c3f530f04610a19d284272f
+  dependencies: []
+- name: ttar
+  version: 8cdfde2f1ddc5f1c22b003002a473fbb1455e02b14167401d7fdd5856fec77b5
+  fingerprint: 8cdfde2f1ddc5f1c22b003002a473fbb1455e02b14167401d7fdd5856fec77b5
+  sha1: sha256:fbae990ea3ed13523b62d7a8ccea6c485c680aa40fbb78c11e4f7cfc92c1863f
+  dependencies: []
+license:
+  version: eba49a3e88a4329d6b7943df92467659a9badda7319648d5e78d45d7f1a19bc4
+  fingerprint: eba49a3e88a4329d6b7943df92467659a9badda7319648d5e78d45d7f1a19bc4
+  sha1: sha256:4462ba848d0f1d9489aab87c79816652cce6d3467153c5e78a6db13931a6b602
diff --git a/releases/haproxy/index.yml b/releases/haproxy/index.yml
index c79c3c1d..8ff86dfa 100644
--- a/releases/haproxy/index.yml
+++ b/releases/haproxy/index.yml
@@ -9,6 +9,8 @@ builds:
     version: 8.2.0
   2c765105-da0a-4e82-8db5-0e95805af095:
     version: 8.1.0
+  3803d9f8-6df8-4eaf-5d83-280b2aae39ab:
+    version: 9.7.0
   41bcfed2-7f91-4413-b40a-312306372e70:
     version: 8.0.12
   45386eef-7ab9-45f5-acf8-4545d37eabf4: