elasticsearch/elasticsearch — pull request #5501 by kimchy (2014-03-23 22:16:34+00:00)
Title: Tribe: Index level blocks, index conflict settings

allow to configure on the index level which blocks can optionally be applied using tribe.blocks.indices prefix settings.
allow to control what will be done when a conflict is detected on index names coming from several clusters using the tribe.on_conflict setting. Defaults remains "any", but now support also "drop" and "prefer_[tribeName]".