phoet / asin

:books: :package: Amazon Simple INterface - Support for ItemLookup, SimilarityLookup, Search, BrowseNode and Cart Operations
http://asin.herokuapp.com/
167 stars 59 forks source link

Loosen hashie version dependency #13

Closed kdonovan closed 13 years ago

kdonovan commented 13 years ago

Tiny change, specs still pass, but this allows asin to be used in a project with gems that require newer versions of hashie, like twitter.

Cheers, -Kali

phoet commented 13 years ago

merged into develop. please make sure to pick the proper branch for you next pull request.

phoet commented 13 years ago

pushed 0.7.0 to rubygems

kdonovan commented 13 years ago

Thanks! Sorry about the branch mixup -- I was a little confused by not having master as the default development branch.

phoet commented 13 years ago

have a look at this to know why: http://nvie.com/posts/a-successful-git-branching-model/

kdonovan commented 13 years ago

Cool, thanks for the pointer! The logic behind the setup is familiar, except I swap the names so develop -> master, and master -> stable. Also, --no-ff for merging branches is a great tip...