Merge branch 1.6 into 1.7

lutovich · lutovich · commit d7a51589ee33 · 2018-07-30T14:05:31.000+02:00
diff --git a/test/v1/examples.test.js b/test/v1/examples.test.js
@@ -111,9 +111,9 @@ describe('examples', () => {
     // tag::config-connection-pool[]
     const driver = neo4j.driver(uri, neo4j.auth.basic(user, password),
       {
-        maxConnectionLifetime: 30*60*60,
+        maxConnectionLifetime: 3 * 60 * 60 * 1000, // 3 hours
         maxConnectionPoolSize: 50,
-        connectionAcquisitionTimeout: 2*60
+        connectionAcquisitionTimeout: 2 * 60 * 1000 // 120 seconds
       }
     );
     // end::config-connection-pool[]

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,9 @@ describe('examples', () => {`
`111`	`111`	`// tag::config-connection-pool[]`
`112`	`112`	`const driver = neo4j.driver(uri, neo4j.auth.basic(user, password),`
`113`	`113`	`{`
`114`		`- maxConnectionLifetime: 306060,`
	`114`	`+ maxConnectionLifetime: 3 * 60 * 60 * 1000, // 3 hours`
`115`	`115`	`maxConnectionPoolSize: 50,`
`116`		`- connectionAcquisitionTimeout: 2*60`
	`116`	`+ connectionAcquisitionTimeout: 2 * 60 * 1000 // 120 seconds`
`117`	`117`	`}`
`118`	`118`	`);`
`119`	`119`	`// end::config-connection-pool[]`