elasticsearch/elasticsearch — pull request #6771 by kimchy (2014-07-07 16:26:57+00:00)
Title: Don't update default mapping on phase2 recovery

the default mapping is not merged, but updated in place, and only put mapping API can change it, no need to make sure it has been properly updated on the master. This can cause conflicts when a put mapping for it happens at the same time.