tree 1c594acee20b3756877f16cb158901e85430dd9e
parent 129300f796f660ce06d7a86627b6869f742892f0
parent ed49b6d0c94cb06c4fb655f26b8e03ce77562f4c
author David Pursehouse <dpursehouse@collab.net> 1528631785 +0900
committer David Pursehouse <dpursehouse@collab.net> 1528631785 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  AbstractElasticIndex: Make type field protected

Change-Id: Ic532bd52e2e7dc832b4e306164a3f7bff1eb39aa