summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Herold <michael.j.herold@gmail.com>2017-02-10 11:39:57 -0600
committerMichael Herold <michael.j.herold@gmail.com>2017-02-10 11:39:57 -0600
commita5906620a3cdff499aea556da6eefdf0de8e5138 (patch)
tree676d821d547799cc782e7a720a913c75658a1eee
parentc36f67ee4c5e6997f7ee90bd41b475abb1394f06 (diff)
downloadhashie-a5906620a3cdff499aea556da6eefdf0de8e5138.tar.gz
Prepare for release of 3.5.2v3.5.2
-rw-r--r--CHANGELOG.md23
-rw-r--r--README.md2
2 files changed, 4 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9ccdc7..064e6a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,36 +6,19 @@ scheme are considered to be bugs.
[semver]: http://semver.org/spec/v2.0.0.html
-## [Unreleased][unreleased]
+## [3.5.2] - 2017-02-10
-[unreleased]: https://github.com/intridea/hashie/compare/v3.5.1...master
+[3.5.2]: https://github.com/intridea/hashie/compare/v3.5.1...v3.5.2
### Added
* [#395](https://github.com/intridea/hashie/pull/395): Add the ability to disable warnings in Mash subclasses - [@michaelherold](https://github.com/michaelherold).
* [#400](https://github.com/intridea/hashie/pull/400): Fix Hashie.logger load and set the Hashie logger to the Rails logger in a Rails environment - [@michaelherold](https://github.com/michaelherold).
-### Changed
-
-* Your contribution here.
-
-### Deprecated
-
-* Your contribution here.
-
-### Removed
-
-* Your contribution here.
-
### Fixed
* [#396](https://github.com/intridea/hashie/pull/396): Fix for specs in #381: Incorrect use of shared context meant example was not being run - [@biinari](https://github.com/biinari).
* [#399](https://github.com/intridea/hashie/pull/399): Fix passing Pathname object to Hashie::Mesh.load() - [@albb0920](https://github.com/albb0920).
-* Your contribution here.
-
-### Security
-
-* Your contribution here.
### Miscellanous
@@ -47,7 +30,7 @@ scheme are considered to be bugs.
[3.5.1]: https://github.com/intridea/hashie/compare/v3.5.0...v3.5.1
-## [3.5.0] - 2017-01-31 (YANKED)
+## [3.5.0] - 2017-01-31
* [#386](https://github.com/intridea/hashie/pull/386): Fix for #385: Make `deep_merge` always `deep_dup` nested hashes before merging them in so that there are no shared references between the two hashes being merged. - [@mltsy](https://github.com/mltsy).
* [#389](https://github.com/intridea/hashie/pull/389): Support Ruby 2.4.0 - [@camelmasa](https://github.com/camelmasa).
diff --git a/README.md b/README.md
index 6ecc499..d37e8da 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ $ gem install hashie
## Upgrading
-You're reading the documentation for the release of Hashie, which should be 3.5.2. Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version. The current stable release is [3.5.1](https://github.com/intridea/hashie/blob/v3.5.1/README.md).
+You're reading the documentation for the stable release of Hashie, 3.5.2. Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
## Hash Extensions