From cf95f00c62034b8f19b70527c1289e161fa211bb Mon Sep 17 00:00:00 2001
From: Thom Shutt <thomshutt@users.noreply.github.com>
Date: Wed, 21 Dec 2022 16:21:34 +0000
Subject: [PATCH] release v0.5.36 (#2699)

---
 CHANGELOG.md         | 23 ++++++++++++++++++++++-
 CHANGELOG_PENDING.md |  9 ---------
 VERSION              |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 251448ff0..8e3dce396 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## v0.5.36
+
+#### General
+- [#2696](https://github.com/livepeer/go-livepeer/pull/2696) Add Rinkeby network deprecation warning (@leszko)
+
+#### Transcoder
+- [#2686](https://github.com/livepeer/go-livepeer/pull/2686) Control non-stream specific scene classification with command line args
+
+#### General
+
+- [#2635](https://github.com/livepeer/go-livepeer/pull/2635) Fix entrypoint path in built docker images (@hjpotter92)
+- [#2646](https://github.com/livepeer/go-livepeer/pull/2646) Include HttpIngest and LocalVerify in param table on startup (@yondonfu)
+
+#### Broadcaster
+
+- [#2666](https://github.com/livepeer/go-livepeer/pull/2666) Re-use a session as long as it passes the latency score threshold check (@yondonfu)
+
+#### Orchestrator
+- [#2639](https://github.com/livepeer/go-livepeer/pull/2639) Increase IdleTimeout for HTTP connections (@leszko)
+- [#2685](https://github.com/livepeer/go-livepeer/pull/2685) Add a log message when sessions are closed by the Broadcaster. Increase transcode loop timeout (@mj1)
+
 ## v0.5.35
 
 *October 21 2022*
@@ -739,4 +760,4 @@ Thanks everyone that submitted bug reports and assisted in testing!
 - [#1775](https://github.com/livepeer/go-livepeer/pull/1775) Fix transcoder load balancer race condition around session cleanup (@jailuthra)
 - [#1784](https://github.com/livepeer/go-livepeer/pull/1784) Use auth token sessionID to index into sessions map in transcoder load balancer (@jailuthra)
 
-[Full list of changes](https://github.com/livepeer/go-livepeer/compare/v0.5.14...v0.5.15)
+[Full list of changes](https://github.com/livepeer/go-livepeer/compare/v0.5.14...v0.5.15)
\ No newline at end of file
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index efd2bf552..3ca504481 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -7,14 +7,12 @@
 ### Features ⚒
 
 #### General
-- \#2696 Add Rinkeby network deprecation warning (@leszko)
 
 #### Broadcaster
 
 #### Orchestrator
 
 #### Transcoder
-- \#2686 Control non-stream specific scene classification with command line args
 
 ### Bug Fixes 🐞
 
@@ -22,15 +20,8 @@
 
 #### General
 
-- \#2635 Fix entrypoint path in built docker images (@hjpotter92)
-- \#2646 Include HttpIngest and LocalVerify in param table on startup (@yondonfu)
-
 #### Broadcaster
 
-- \#2666 Re-use a session as long as it passes the latency score threshold check (@yondonfu)
-
 #### Orchestrator
-- \#2639 Increase IdleTimeout for HTTP connections (@leszko)
-- \#2685 Add a log message when sessions are closed by the Broadcaster. Increase transcode loop timeout (@mj1)
 
 #### Transcoder
diff --git a/VERSION b/VERSION
index 0defa4dc0..0aa6e4f8d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.35
+0.5.36
\ No newline at end of file