Merge branch 'master' into 799_swagger_jsonapi_docs

Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec :name => 'flapjack'
 
-gem 'zermelo', :github => 'flapjack/zermelo', :branch => 'master'
-
 group :development do
   gem 'ruby-prof'
 end

Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: git://github.com/flapjack/zermelo.git
-  revision: f5ab7a2c8043b089d16e6a78c1ec506296825eb1
-  branch: master
-  specs:
-    zermelo (1.0.1)
-      activemodel
-
 PATH
   remote: .
   specs:
@@ -19,7 +11,6 @@ PATH
       ice_cube
       mail
       oj (>= 2.9.0)
-      rack
       rbtrace
       redis (>= 3.0.7)
       sinatra
@@ -29,6 +20,7 @@ PATH
       tzinfo
       tzinfo-data
       xmpp4r (>= 0.5.5)
+      zermelo (= 1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -173,6 +165,8 @@ GEM
       crack (>= 0.3.2)
     webrick (1.3.1)
     xmpp4r (0.5.6)
+    zermelo (1.1.0)
+      activemodel
 
 PLATFORMS
   ruby
@@ -189,4 +183,3 @@ DEPENDENCIES
   ruby-prof
   simplecov
   webmock
-  zermelo!

README.md

@@ -140,6 +140,8 @@ We are [updating](https://github.com/flapjack/flapjack/issues/624) this section
 
 Information on developing more Flapjack components or contributing to core Flapjack development can be found in the [Developing](http://flapjack.io/docs/1.0/development/DEVELOPING/) section of [the docs](http://flapjack.io/docs/1.0/).
 
+Note that the master branch is still undergoing breaking changes and is for Flapjack 2. Building packages from the master branch is unlikely to work. Current stable builds are built from the maint/1.x branch.
+
 ## Documentation Submodule
 
 We have the documentation for this project on a github wiki and also referenced as a submodule at /doc in this project. Run the following commands to populate the local doc/ directory:

flapjack.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'oj', '>= 2.9.0'
   gem.add_dependency 'hiredis'
   gem.add_dependency 'redis', '>= 3.0.7'
-  # gem.add_dependency 'zermelo', '= 1.0.1'
-  gem.add_dependency 'rack'
+  gem.add_dependency 'zermelo', '= 1.1.0'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'swagger-blocks'
   gem.add_dependency 'mail'