elasticsearch/elasticsearch — pull request #3018 by akahn (2013-05-09 20:56:57+00:00)
Title: Reject update request that has both script and doc

See #2967.