From 605732a3e851fa7c267ca7d63ba336ff82ca24e8 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Sat, 21 Sep 2013 17:05:45 -0700
Subject: [PATCH] Update changes, version

---
 Changes.md             | 17 +++++++++++++++++
 lib/sidekiq/version.rb |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 0d968310..bb89a6cb 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,20 @@
+2.15.0
+-----------
+
+- The Core Sidekiq actors are now monitored.  If any crash, the
+  Sidekiq process will exit immediately.  This is to help prevent
+  "stuck" Sidekiq processes which are running but don't appear to
+  be doing any work. [#1194]
+- Sidekiq's testing framework is now dynamic.  You can choose between
+  `inline` and `fake` behavior in your tests. [#1193]
+- The Retries table has a new column for the error message.
+- Sidekiq.default\_worker\_options allows you to configure default
+  options for all Sidekiq worker types.
+
+```ruby
+Sidekiq.default_worker_options = { 'queue' => 'default', 'backtrace' => true }
+```
+
 2.14.1
 -----------
 
diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
index e76eb717..8385294f 100644
--- a/lib/sidekiq/version.rb
+++ b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.14.1"
+  VERSION = "2.15.0"
 end