From 7f6ac558b64c60ab10b733c02dc9a4aa38902d61 Mon Sep 17 00:00:00 2001
From: CI Bot <ci@starkandwayne.com>
Date: Fri, 24 May 2019 15:20:48 +0000
Subject: [PATCH] release v9.6.0

---
 .final_builds/jobs/haproxy/index.yml |  4 +++
 ci/release_notes.md                  | 13 ----------
 manifests/haproxy.yml                |  6 ++---
 releases/haproxy/haproxy-9.6.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.6.0.yml

diff --git a/.final_builds/jobs/haproxy/index.yml b/.final_builds/jobs/haproxy/index.yml
index 72d5dde3..fe527a01 100644
--- a/.final_builds/jobs/haproxy/index.yml
+++ b/.final_builds/jobs/haproxy/index.yml
@@ -99,6 +99,10 @@ builds:
     version: c1371a72ed2e08c7b488d75ec13477946df169a6
     blobstore_id: 6e47178a-aa0b-4c18-5e09-1e9f36ec29a9
     sha1: 5d55cae1ecb230b457d1eaccbadef9b5b6d6c5dd
+  c77f4314ce1e82391f7f1bc9dbe3ca9e47e8af5c4fc2f9608f709b28a56f527d:
+    version: c77f4314ce1e82391f7f1bc9dbe3ca9e47e8af5c4fc2f9608f709b28a56f527d
+    blobstore_id: d1d55649-7348-4ba9-4904-eadc86066eea
+    sha1: sha256:f643ea5f8ab8d8c9774b0f9f6ba3c77ebaac3e4c54ba8246e670b69238b6889a
   c7bd850c0b653ee423ba09247018db2d6edf32de:
     version: c7bd850c0b653ee423ba09247018db2d6edf32de
     blobstore_id: b8b308ca-d532-4399-a8b0-3fb865233d57
diff --git a/ci/release_notes.md b/ci/release_notes.md
deleted file mode 100644
index d269904d..00000000
--- a/ci/release_notes.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Improvements
-- `ha_proxy.http_request_deny_conditions`  now supports negations of ACLs thanks to @gdenn
-   Simply add the `negate: true` field to your ACL to negate it.
-- `ha_proxy.cidrs_in_file` has been added to allow users to specify a wide array of ACLs
-  that apply to an ACL in the `ha_proxy.http_request_deny_conditions` ACL list, which
-  would otherwise be too long for haproxy to start up properly. Take a look at [the example]
-  for more details(https://github.com/cloudfoundry-incubator/haproxy-boshrelease/blob/master/jobs/haproxy/spec#L396-L406).
-  Thanks @gdenn for this feature as well!
-
-# Bug Fixes
-
-- Resolved an issue where the haproxy stop script would fail if haproxy was already stopped.
-  Thanks for the fix @domdom82!
diff --git a/manifests/haproxy.yml b/manifests/haproxy.yml
index e5273aa3..cc3dc457 100644
--- a/manifests/haproxy.yml
+++ b/manifests/haproxy.yml
@@ -38,6 +38,6 @@ releases:
 - name: bpm
   version: latest
 - name: haproxy
-  version: 9.5.2
-  url: https://github.com/cloudfoundry-incubator/haproxy-boshrelease/releases/download/v9.5.2/haproxy-9.5.2.tgz
-  sha1: 34e1120cd321dcdb0a359b3c8873b75a7b60575b
+  version: 9.6.0
+  url: https://github.com/cloudfoundry-incubator/haproxy-boshrelease/releases/download/v9.6.0/haproxy-9.6.0.tgz
+  sha1: 2e4715251b9446d4e45818f315ef021c35a7564f
diff --git a/releases/haproxy/haproxy-9.6.0.yml b/releases/haproxy/haproxy-9.6.0.yml
new file mode 100644
index 00000000..0673404e
--- /dev/null
+++ b/releases/haproxy/haproxy-9.6.0.yml
@@ -0,0 +1,38 @@
+name: haproxy
+version: 9.6.0
+commit_hash: 3a9b189
+uncommitted_changes: false
+jobs:
+- name: haproxy
+  version: c77f4314ce1e82391f7f1bc9dbe3ca9e47e8af5c4fc2f9608f709b28a56f527d
+  fingerprint: c77f4314ce1e82391f7f1bc9dbe3ca9e47e8af5c4fc2f9608f709b28a56f527d
+  sha1: sha256:f643ea5f8ab8d8c9774b0f9f6ba3c77ebaac3e4c54ba8246e670b69238b6889a
+  packages:
+  - haproxy
+  - ttar
+- name: keepalived
+  version: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a
+  fingerprint: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a
+  sha1: sha256:92d8f1996f108950d19400fb0af33350892599b3f921a0a81f7baebacacc11fb
+  packages:
+  - keepalived
+packages:
+- name: haproxy
+  version: 2a00699be041662a5c081ae330ff13bcd55dda96d5036554f378d55e1de5d663
+  fingerprint: 2a00699be041662a5c081ae330ff13bcd55dda96d5036554f378d55e1de5d663
+  sha1: sha256:d0ff766ee527ed090aaea8826d4f6cec1c1f73bd48b2aebfe932304b932659e0
+  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 e07c414b..256c02aa 100644
--- a/releases/haproxy/index.yml
+++ b/releases/haproxy/index.yml
@@ -79,6 +79,8 @@ builds:
     version: 8.0.5
   e6661160-264c-4c74-a1f6-7fd4bb3855dd:
     version: 8.0.11
+  e7e1994d-1d05-4aad-66e8-b8e1910da29b:
+    version: 9.6.0
   e88bf54e-7cad-4494-5cd2-1ca1c6467237:
     version: 8.6.1
   ef02dfc2-96a0-4c20-77b3-ec684714193a: