tree 8d1a92934e6ed4c1cf2076cf3dba6e5305400cf1
parent f98a4c3af329f868caa8fcc1fe93e8881910ed75
parent 3632dadb3a1956d57a5e7e5d2325990ca218364e
author David Pursehouse <dpursehouse@collab.net> 1528097921 +0900
committer David Pursehouse <dpursehouse@collab.net> 1528100357 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  GroupField: Change UUID fields' type to KEYWORD
  Add keyword type to index type system
  Elasticsearch: Encapsulate supported versions in an enum

Change-Id: Ic30a5bc0c69623a22f1305c96bfa70e3daeed054