Merge pull request #4813 from realm/jp-update-os

update Object Store
realm · Apr 3, 2017 · d7ef625 · d7ef625
2 parents 903638b + 88f256a
commit d7ef625
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ x.x.x Release notes (yyyy-MM-dd)
 ### Bugfixes
 
 * Fix CocoaPods installation with static libraries and multiple platforms.
+* Fix uncaught "Bad version number" exceptions on the notification worker thread
+  followed by deadlocks when Realms refresh.
 
 2.5.0 Release notes (2017-03-28)
 =============================================================

diff --git a/Realm/ObjectStore b/Realm/ObjectStore
+2 −0		src/impl/realm_coordinator.cpp
+1 −1		src/sync/sync_session.cpp
+18 −2		tests/realm.cpp
+21 −0		tests/results.cpp