RSpec 2.14 is a bit of a nazi about deprecations - make them disappear
Merge pull request #427 from smarterclayton/fix_deprecation_warnings

Merged by openshift-bot