Skip to content

Commit

Permalink
Merge branch 'master' into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
untergeek committed Oct 25, 2017
2 parents d8475a0 + 370f0ee commit e6005c0
Show file tree
Hide file tree
Showing 32 changed files with 1,657 additions and 1,743 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
- ES_VERSION=5.3.3
- ES_VERSION=5.4.3
- ES_VERSION=5.5.2
- ES_VERSION=5.6.3

os: linux

Expand Down
Loading

0 comments on commit e6005c0

Please sign in to comment.