From 77d026e491ff06f5e9cd1310a1af8c8398a41b1f Mon Sep 17 00:00:00 2001 From: MHova Date: Thu, 28 Jan 2016 09:12:12 -0800 Subject: [PATCH 1/2] Fix docs specifying an incorrect terminating condition https://github.com/bitemyapp/bloodhound/issues/95 --- src/Database/Bloodhound/Client.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Database/Bloodhound/Client.hs b/src/Database/Bloodhound/Client.hs index 97b0e53..088431b 100644 --- a/src/Database/Bloodhound/Client.hs +++ b/src/Database/Bloodhound/Client.hs @@ -680,9 +680,8 @@ scroll' (Just sid) = do Right SearchResult {..} -> return (hits searchHits, scrollId) Left _ -> return ([], Nothing) --- | Use the given scroll to fetch the next page of documents. If --- there are still further pages, there will be a value in the --- 'scrollId' field of the 'SearchResult' +-- | Use the given scroll to fetch the next page of documents. If there are no +-- further pages, 'SearchResult.searchHits.hits' will be '[]'. advanceScroll :: ( FromJSON a , MonadBH m From 45efac78a03a6d30dca4bbdd30351dfb42811a9c Mon Sep 17 00:00:00 2001 From: MHova Date: Thu, 28 Jan 2016 15:15:31 -0800 Subject: [PATCH 2/2] Update README to warn about 2.0 compatibility --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d597550..35bd59b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Endorsements Version compatibility --------------------- -Elasticsearch \>= 1.0 is recommended. Bloodhound mostly works with 0.9.x, but I don't recommend it if you expect everything to work. As of Bloodhound 0.3 all \>=1.0 versions of Elasticsearch work. +Elasticsearch \>=1.0 && \<2.0 is recommended. Bloodhound mostly works with 0.9.x, but I don't recommend it if you expect everything to work. As of Bloodhound 0.3 all \>=1.0 && \<2.0 versions of Elasticsearch work. Some (or even most?) features will work with versions \>=2.0, but it is not officially supported yet. Current versions we test against are 1.0.3, 1.1.2, 1.2.3, 1.3.2, and 1.4.0. We also check that GHC 7.6 and 7.8 both build and pass tests. See our [TravisCI](https://travis-ci.org/bitemyapp/bloodhound) to learn more.