git.iko.soy/typeable/bloodhound
on master help sign in
Merge remote-tracking branch 'upstream/master' into suggest
commita8b5c618b1e4ccd6283571a9fed530fc02a2a43f authorJosh Berman <berman.josh@gmail.com> dateWed 26 Apr 2017, 15:29 (9 years ago) parentbd513b753defce
4 files changed+39−5
compare with master
unifiedsplit
Makefile+7−1 bloodhound.cabal+2−2 changelog.md+27 stack-7.10.yaml+3−2
Makefile+7−1
@@ -14,11 +14,17 @@ test: echo-warn
1414 STACK_YAML="stack-7.8.yaml" stack test
1515
16167.10-build:
17− STACK_YAML="stack-8=7.10.yaml" stack build
17+ STACK_YAML="stack-7.10.yaml" stack build
1818
19197.10-test: echo-warn
2020 STACK_YAML="stack-7.10.yaml" stack test
2121
22+7.10-test-ES1:
23+ STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES1
24+
25+7.10-test-ES5:
26+ STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
27+
2228ghci:
2329 stack ghci
2430
bloodhound.cabal+2−2
@@ -1,5 +1,5 @@
11name: bloodhound
2−version: 0.13.0.0
2+version: 0.14.0.0
33synopsis: ElasticSearch client library for Haskell
44description: ElasticSearch made awesome for Haskell hackers
55homepage: https://github.com/bitemyapp/bloodhound
@@ -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.2,
47+ aeson >= 0.11.1 && <1.3,
4848 http-client >= 0.4.30 && <0.6,
4949 network-uri >= 2.6 && <2.7,
5050 semigroups >= 0.15 && <0.19,
changelog.md+27
@@ -1,3 +1,30 @@
1+0.14.0.0
2+===================
3+
4+- @bitemyapp
5+ - Aeson 1.2
6+
7+- @shmish111
8+ - #177 Added stats aggregation
9+
10+- @justinwhite
11+ - #176 Fixed typo
12+
13+- @WraithM
14+ - #175 Sorted version of getInitialScroll for V5 client
15+
16+0.13.0.0
17+===================
18+
19+- @michaelxavier
20+ - #174 doctests are bad
21+ - #171 Added Semigroup instances
22+ - #165 Aeson 1.1
23+
24+- @bermanjosh
25+ - #168 Sub-aggregation support
26+ - #167 Limit QuickCheck to 500 checks
27+
1280.12.1.0
229===================
330* @michaelxavier
stack-7.10.yaml+3−2
@@ -6,12 +6,13 @@ packages:
66- './examples'
77extra-deps:
88- http-client-0.5.0
9−- aeson-0.11.1.0
9+- aeson-1.2.0.0
1010- fail-4.9.0.0
1111- http-types-0.9
1212- attoparsec-0.13.0.1
1313- quickcheck-properties-0.1
14−- semigroups-0.18.0.1
14+- semigroups-0.18.3
1515- uri-bytestring-0.1.9
1616- temporary-resourcet-0.1.0.0
17+- transformers-compat-0.5.1.4
1718resolver: lts-6.12