tree 6885ab1dc167012deae91cf78c65f1fdd070e5c6
parent 529d5b979e5adc6d8d42f98ddf069ea6549cc45d
parent 2f3f0d793cd7f045d62dce167c17002d41cac498
author Arjan Seijkens <a.seijkens@quadient.com> 1575987860 +0100
committer Arjan Seijkens <a.seijkens@quadient.com> 1575987860 +0100

Merge branch 'master' into release/5.3.2-HI

# Conflicts:
#	elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContext.java
#	elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestUpdateCallback.java
#	elasticsearch/rest/src/test/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContexFactoryIT.java