b3d943c · typeable/bloodhound

git.iko.soy/typeable/bloodhound

merge master

commitb3d943c31fc3d6b4df06b3fb73eb663201d4715d authorJosh Berman <berman.josh@gmail.com> dateMon 16 Jan 2017, 13:46 (10 years ago) parent4343d8f de5d9c8

5 files changed+11−4

compare with master

unifiedsplit

bloodhound.cabal+1−1 changelog.md+7 src/Database/V1/Bloodhound/Types.hs+1−1 stack-8.0.yaml+1−1 tests/V1/tests.hs+1−1

bloodhound.cabal+1−1

@@ -44,7 +44,7 @@ library

4444 build-depends: base >= 4.3 && <5,

4545 bytestring >= 0.10.0 && <0.11,

4646 containers >= 0.5.0.0 && <0.6,

47− aeson >= 0.11.1 && <1.1,

47+ aeson >= 0.11.1 && <1.2,

4848 http-client >= 0.4.30 && <0.6,

4949 network-uri >= 2.6 && <2.7,

5050 semigroups >= 0.15 && <0.19,

changelog.md+7

@@ -1,3 +1,10 @@

1+0.12.1.0

2+===================

3+* @michaelxavier

4+ - #162 Allow Aeson 1.1

5+* @bermanjosh

6+ - #159 Fix bug with tie breaker json instance for MultiMatchQuery

180.12.0.0

29===================

310This release contains several new APIs, documentation fixes, and some minor type updates, and steps towards ES 2.0 support. Thanks to all of our contributors!

src/Database/V1/Bloodhound/Types.hs+1−1

@@ -2012,7 +2012,7 @@ instance BucketAggregation DateRangeResult where

20122012 docCount = dateRangeDocCount

20132013 aggs = dateRangeAggs

20142014

2015−instance (FromJSON a, BucketAggregation a) => FromJSON (Bucket a) where

2015+instance (FromJSON a) => FromJSON (Bucket a) where

20162016 parseJSON (Object v) = Bucket <$>

20172017 v .: "buckets"

20182018 parseJSON _ = mempty

stack-8.0.yaml+1−1

@@ -3,7 +3,7 @@ packages:

33- '.'

44extra-deps:

55- quickcheck-properties-0.1

6−

6+- aeson-1.1.0.0

77# - http-client-0.5.0

88# - fail-4.9.0.0

99# - http-types-0.9

tests/V1/tests.hs+1−1

@@ -586,7 +586,7 @@ instance ApproxEq Vers.Version where

586586 (=~) = (==)

587587instance (ApproxEq a, Show a) => ApproxEq [a] where

588588 as =~ bs = and (zipWith (=~) as bs)

589−instance (ApproxEq l, Show l, ApproxEq r, Show r) => ApproxEq (Either l r) where

589+instance (ApproxEq l, ApproxEq r) => ApproxEq (Either l r) where

590590 Left a =~ Left b = a =~ b

591591 Right a =~ Right b = a =~ b

592592 _ =~ _ = False