From daee2f9c46a800e3e87167976a53509b7c7a33f0 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 2 Mar 2016 12:59:23 -0800
Subject: [PATCH] ent 1.2.1

---
 Changes.md             | 1 +
 Ent-Changes.md         | 9 +++++++++
 lib/sidekiq/version.rb | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index a2e173e6..bc28f691 100644
--- a/Changes.md
+++ b/Changes.md
@@ -3,6 +3,7 @@
 HEAD
 -----------
 
+- Don't fill logfile in case of Redis downtime [#2860]
 - Allow definition of a global retries_exhausted handler. [#2807]
 ```ruby
 Sidekiq.configure_server do |config|
diff --git a/Ent-Changes.md b/Ent-Changes.md
index 342a25be..bc357410 100644
--- a/Ent-Changes.md
+++ b/Ent-Changes.md
@@ -3,6 +3,15 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+1.2.1
+-------------
+
+- Multi-Process mode can now monitor the RSS memory of children and
+  restart any that grow too large.  To limit children to 1GB each:
+```
+MAXMEM_KB=1048576 COUNT=2 bundle exec sidekiqswarm ...
+```
+
 1.2.0
 -------------
 
diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
index c5799ace..e54f1de5 100644
--- a/lib/sidekiq/version.rb
+++ b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end