Browse files

fixing issue with 1.8.x tests

  • Loading branch information...
1 parent f91a41d commit 0bc7df8a59e0d66aa6314589ae1a6dd1eabc4209 @brandonblack brandonblack committed Nov 18, 2012
Showing with 5 additions and 2 deletions.
  1. +1 −0 HISTORY
  2. +3 −1 README.md
  3. +1 −1 lib/mongo/util/write_concern.rb
View
1 HISTORY
@@ -0,0 +1 @@
+TODO: Add change log for release here
View
4 README.md
@@ -1,9 +1,11 @@
-[![Build Status][travis-img]][travis-url] [![Code Climate][codeclimate-img]][codeclimate-url]
+[![Build Status][travis-img]][travis-url] [![Jenkins Status][jenkins-img]][jenkins-url] [![Code Climate][codeclimate-img]][codeclimate-url]
[travis-img]: https://secure.travis-ci.org/mongodb/mongo-ruby-driver.png
[travis-url]: http://travis-ci.org/mongodb/mongo-ruby-driver
[codeclimate-img]: https://codeclimate.com/badge.png
[codeclimate-url]: https://codeclimate.com/github/mongodb/mongo-ruby-driver
+[jenkins-img]: https://jenkins.10gen.com/job/mongo-ruby-driver/badge/icon
+[jenkins-url]: https://jenkins.10gen.com/job/mongo-ruby-driver/
[api-url]: http://api.mongodb.org/ruby/current
# Documentation
View
2 lib/mongo/util/write_concern.rb
@@ -55,7 +55,7 @@ def get_write_concern(opts, parent=nil)
:wtimeout => false
}
write_concern.merge!(parent.write_concern) if parent
- write_concern.merge!(opts.select {|k| write_concern.keys.include?(k)})
+ write_concern.merge!(opts.reject {|k,v| !write_concern.keys.include?(k)})
write_concern
end

0 comments on commit 0bc7df8

Please sign in to comment.