Merge remote-tracking branch 'github/pr/376' into v1.1

[ci skip]
This commit is contained in:
Daniele Alessandri
2016-11-22 15:32:30 +01:00
@@ -515,8 +515,10 @@ class SentinelReplication implements ReplicationInterface
/**
* Asserts that the specified connection matches an expected role.
*
* @param NodeConnectionInterface $sentinel Connection to a redis server.
* @param string $role Expected role of the server ("master", "slave" or "sentinel").
* @param NodeConnectionInterface $connection Connection to a redis server.
* @param string $role Expected role of the server ("master", "slave" or "sentinel").
*
* @throws RoleException
*/
protected function assertConnectionRole(NodeConnectionInterface $connection, $role)
{