Permalink
Browse files

Merge in changes from 2-6-maintenance branch

- no functional changes, just dev dependencies, configs, and changelog
  • Loading branch information...
1 parent b13d0f1 commit c3d9f1beb6703ea4960bd7d1465d59bf936340a1 @dchelimsky dchelimsky committed May 24, 2011
Showing with 5 additions and 8 deletions.
  1. +1 −1 Gemfile
  2. +3 −6 features/Changelog.md
  3. +1 −1 lib/rspec/core/version.rb
View
@@ -11,7 +11,7 @@ source "http://rubygems.org"
end
### dev dependencies
-gem "rake", "~> 0.8"
+gem "rake", "~> 0.9"
gem "cucumber", "~> 0.10.2"
gem "aruba", "~> 0.3.6"
gem "rcov", "0.9.9", :platforms => :mri
View
@@ -1,15 +1,12 @@
-### 2.6.3 / not released
+### 2.6.3 / 2011-05-24
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...master)
-
-* Minor output enhancment
- * Add dump of shell commands to re-run failed examples
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...v2.6.3)
* Bug fixes
* Explicitly convert exit code to integer, avoiding TypeError when return
value of run is IO object proxied by `DRb::DRbObject` (Julian Scheid)
* Clarify behavior of `--example` command line option
-
+ * Build using a rubygems-1.6.2 to avoid downstream yaml parsing error
### 2.6.2 / 2011-05-21
@@ -1,7 +1,7 @@
module RSpec # :nodoc:
module Core # :nodoc:
module Version # :nodoc:
- STRING = '2.6.3.beta1'
+ STRING = '2.6.3'
end
end
end

0 comments on commit c3d9f1b

Please sign in to comment.