Add retry_on_conflict support to bulk api

Closes ruflin#623

Author: Nik Everett

changes.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+2014-06-02
+- add retry_on_conflict support to bulk #623
+
 2014-06-01
 - toString updated to consider doc_as_upsert if sent an array source #622
 

lib/Elastica/Bulk/Action/IndexDocument.php

@@ -42,6 +42,7 @@ protected function _getMetadataByDocument(Document $document)
             'parent',
             'ttl',
             'timestamp',
+            'retry_on_conflict',
         );
         $metadata = $document->getOptions($params, true);
 

test/lib/Elastica/Test/BulkTest.php

@@ -616,6 +616,25 @@ public function testGetPath()
         $this->assertEquals($indexName . '/' . $typeName . '/_bulk', $bulk->getPath());
     }
 
+    public function testRetry()
+    {
+        $index = $this->_createIndex();
+        $type = $index->getType('bulk_test');
+        $client = $index->getClient();
+
+        $doc1 = $type->createDocument(1, array('name' => 'Mister Fantastic'));
+        $doc1->setOpType(Action::OP_TYPE_UPDATE);
+        $doc1->setRetryOnConflict(5);
+
+        $bulk = new Bulk($client);
+        $bulk->addDocument($doc1);
+
+        $actions = $bulk->getActions();
+
+        $metadata = $actions[0]->getMetadata();
+        $this->assertEquals(5, $metadata[ '_retry_on_conflict' ]);
+    }
+
     public function udpDataProvider()
     {
         return array(