Commit dc2a19d

authored

Merge 5.1 into 5.x (#3207)

2 parents 3663919 + 4b91f77 commit dc2a19dCopy full SHA for dc2a19d

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,8 @@ public function testPingMethod()`
`350`	`350`	`'dsn' => env('MONGODB_URI', 'mongodb://127.0.0.1/'),`
`351`	`351`	`'database' => 'unittest',`
`352`	`352`	`'options' => [`
`353`		`- 'connectTimeoutMS' => 100,`
`354`		`- 'serverSelectionTimeoutMS' => 250,`
	`353`	`+ 'connectTimeoutMS' => 1000,`
	`354`	`+ 'serverSelectionTimeoutMS' => 6000,`
`355`	`355`	`],`
`356`	`356`	`];`
`357`	`357`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`'dsn' => env('MONGODB_URI', 'mongodb://127.0.0.1/'),`
`11`	`11`	`'database' => env('MONGODB_DATABASE', 'unittest'),`
`12`	`12`	`'options' => [`
`13`		`- 'connectTimeoutMS' => 100,`
`14`		`- 'serverSelectionTimeoutMS' => 250,`
	`13`	`+ 'connectTimeoutMS' => 1000,`
	`14`	`+ 'serverSelectionTimeoutMS' => 6000,`
`15`	`15`	`],`
`16`	`16`	`],`
`17`	`17`

Comments

(0)