From 5f7121b03e3c7e6b330cd23850331c8718bf4343 Mon Sep 17 00:00:00 2001
From: Vlad Gorodetsky <v@gor.io>
Date: Tue, 4 Feb 2020 15:38:24 +0200
Subject: [PATCH 1/2] Add changelog for 1.26.1

---
 CHANGELOG.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f728a67d6..2bebeb106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,19 @@
 # Changelog
 
-
 #### Unreleased
 
+#### Version 1.26.1 (2020-02-04)
+
+Improvements:
+- Add requests-in-flight metric ([1539](https://github.com/Shopify/sarama/pull/1539))
+- Fix misleading example for cluster admin ([1595](https://github.com/Shopify/sarama/pull/1595))
+- Replace Travis with GitHub Actions, linters housekeeping ([1573](https://github.com/Shopify/sarama/pull/1573))
+- Allow BalanceStrategy to provide custom assignment data ([1592](https://github.com/Shopify/sarama/pull/1592))
+
+Bug Fixes:
+- Adds back Consumer.Offsets.CommitInterval to fix API ([1590](https://github.com/Shopify/sarama/pull/1590))
+- Fix error message s/CommitInterval/AutoCommit.Interval ([1589](https://github.com/Shopify/sarama/pull/1589))
+
 #### Version 1.26.0 (2020-01-24)
 
 New Features:

From 3e01db50d5ab8f391ea60eb0cc8de32c55dd57ad Mon Sep 17 00:00:00 2001
From: Vlad Gorodetsky <v@gor.io>
Date: Tue, 4 Feb 2020 17:21:30 +0200
Subject: [PATCH 2/2] Fix linter issue

---
 balance_strategy_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/balance_strategy_test.go b/balance_strategy_test.go
index f930d7663..4f797f78a 100644
--- a/balance_strategy_test.go
+++ b/balance_strategy_test.go
@@ -64,7 +64,6 @@ func TestBalanceStrategyRange(t *testing.T) {
 }
 
 func TestBalanceStrategyRangeAssignmentData(t *testing.T) {
-
 	strategy := BalanceStrategyRange
 
 	members := make(map[string]ConsumerGroupMemberMetadata, 2)
@@ -214,7 +213,6 @@ func Test_deserializeTopicPartitionAssignment(t *testing.T) {
 }
 
 func TestBalanceStrategyRoundRobinAssignmentData(t *testing.T) {
-
 	strategy := BalanceStrategyRoundRobin
 
 	members := make(map[string]ConsumerGroupMemberMetadata, 2)
@@ -1994,7 +1992,6 @@ func Test_stickyBalanceStrategy_Plan_ConflictingPreviousAssignments(t *testing.T
 }
 
 func Test_stickyBalanceStrategy_Plan_AssignmentData(t *testing.T) {
-
 	s := &stickyBalanceStrategy{}
 
 	members := make(map[string]ConsumerGroupMemberMetadata, 2)