elasticsearch/elasticsearch — pull request #3266 by Paikan (2013-06-30 14:53:22+00:00)
Title: Don't ignore doc_as_upsert_value and simplify. Closes #3265

This simplifies the code and should close #3265