Merge branch 'master' into add-hotswapping-aliased-indexes-on-populate

Conflicts:
	Resetter.php
This commit is contained in:
Tim Nagel 2014-03-17 09:18:57 +11:00
commit 49521e9fc4
25 changed files with 251 additions and 55 deletions

View file

@ -27,7 +27,7 @@ class Client extends ElasticaClient
'transport' => $connection->getTransport(),
);
$this->_logger->logQuery($path, $method, $data, $time, $connection_array);
$this->_logger->logQuery($path, $method, $data, $time, $connection_array, $query);
}
return $response;