Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

Elasticsearch DSL
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

06c553b0

Unverified Commit 06c553b0 authored 5 years ago by Simonas Šerlinskas

Downloads
- Plain Diff

Merge branch 'OliverSkroblin-master' into 6.x

# Conflicts:
#	src/FieldAwareTrait.php
#	src/Sort/NestedSort.php

parents e0273b1f cfa3b38e

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/Aggregation/Bucketing/CompositeAggregation.php 8 additions, 4 deletions

src/Aggregation/Bucketing/CompositeAggregation.php
src/Search.php 18 additions, 0 deletions

src/Search.php
tests/Unit/Aggregation/Bucketing/CompositeAggregationTest.php 72 additions, 0 deletions

...s/Unit/Aggregation/Bucketing/CompositeAggregationTest.php

with 98 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment