From 69470d7e20181f016d5fb40ed139a12800f888c1 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Fri, 27 Mar 2015 12:01:39 +1100
Subject: [PATCH] Fix the previous release.

---
 CHANGELOG-3.1.md              | 4 ++++
 Provider/AbstractProvider.php | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index 63da912..1a23ece 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -9,6 +9,10 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/commit/XXX where XXX is
 the commit hash. To get the diff between two versions, go to
 https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.4...v3.1.0
 
+* 3.1.2 (2015-03-27)
+
+ * Fix the previous release
+
 * 3.1.1 (2015-03-27)
 
  * Fix PopulateCommand trying to set formats for ProgressBar in Symfony < 2.5
diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php
index af000f0..cf38432 100644
--- a/Provider/AbstractProvider.php
+++ b/Provider/AbstractProvider.php
@@ -104,12 +104,11 @@ abstract class AbstractProvider implements ProviderInterface
      */
     protected function configureOptions()
     {
-        $this->resolver->setAllowedTypes('batch_size', 'int');
-
         $this->resolver->setDefaults(array(
             'batch_size' => 100,
             'skip_indexable_check' => false,
         ));
+        $this->resolver->setAllowedTypes('batch_size', 'int');
 
         $this->resolver->setRequired(array(
             'indexName',