Merge remote-tracking branch 'dakrone/document-shield-apis'

Original commit: elastic/x-pack-elasticsearch@321b5bfc80
This commit is contained in:
Lee Hinman 2016-01-28 15:59:12 -07:00
commit 7331f8b179

Diff Content Not Available