From 6856f90068b1e8a1d7c7dbcd3251ac237259e4e0 Mon Sep 17 00:00:00 2001
From: Justin Coyne <justin@curationexperts.com>
Date: Wed, 25 Sep 2013 12:02:05 -0500
Subject: [PATCH] Preparing for 3.3.0 release

---
 History.md                               | 17 +++++++++++++++++
 SUFIA_VERSION                            |  2 +-
 lib/sufia/version.rb                     |  2 +-
 sufia-models/lib/sufia/models/version.rb |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index b0060831dc..2f6cd2d723 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,22 @@
 # History of Sufia releases
 
+## 3.3.0
+* Fix authorities deprecations [Justin Coyne]
+* Fix deprecation on MailboxController [Justin Coyne]
+* blacklight 4.4.1/0 doesn't work with kaminari > 0.14.1 See projectblacklight/blacklight#614 [Justin Coyne]
+* Allow acts_as_follower to be 0.2.0 for Rails 4 support [Justin Coyne]
+* Don't run blacklight and hydra generator twice [Justin Coyne]
+* Remove deprecation warning on Rails 4 [Justin Coyne]
+* Updating CONTRIBUTING.md as per Hydra v6.0.0 [Jeremy Friesen]
+* use cancan to authorize and validate single-use tokens. [Chris Beer]
+* Add ImageMagick as a software requirement in the README. [Jessie Keck]
+* split SingleUseLinkController into the authenticated controller that creates links, and a viewer that handles retrieving content for token-bearing users [Chris Beer]
+* remove explicit GenericFile references, and replace them with Rails magic [Chris Beer]
+* Refactor single-use links for style and clarity [Chris Beer]
+* add more gems to the gemfile for running tests from the gem root [Chris Beer]
+* add redis-server to the .travis.yml list of  services [Chris Beer]
+* Fix typos in README.md [Jessie Keck]
+
 ## 3.2.1
 * Updating gemspec to not limit on sufia-models [Jeremy Friesen]
 
diff --git a/SUFIA_VERSION b/SUFIA_VERSION
index e4604e3afd..15a2799817 100644
--- a/SUFIA_VERSION
+++ b/SUFIA_VERSION
@@ -1 +1 @@
-3.2.1
+3.3.0
diff --git a/lib/sufia/version.rb b/lib/sufia/version.rb
index 74a8dcecab..3ad97e7705 100644
--- a/lib/sufia/version.rb
+++ b/lib/sufia/version.rb
@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end
diff --git a/sufia-models/lib/sufia/models/version.rb b/sufia-models/lib/sufia/models/version.rb
index 039aa0cbfe..82e5622daf 100644
--- a/sufia-models/lib/sufia/models/version.rb
+++ b/sufia-models/lib/sufia/models/version.rb
@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.2.1"
+    VERSION = "3.3.0"
   end
 end