Merge remote-tracking branch 'upstream/1.0' into 1.1

pontusmelke · pontusmelke · commit 53a1601cd183 · 2016-09-08T13:06:28.000+02:00
diff --git a/driver/src/main/java/org/neo4j/driver/v1/Config.java b/driver/src/main/java/org/neo4j/driver/v1/Config.java
@@ -354,7 +354,7 @@ public static TrustStrategy trustCustomCertificateSignedBy( File certFile )
             return new TrustStrategy( Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES, certFile );
         }
 
-        public static TrustStrategy trustSystemCertifcates()
+        public static TrustStrategy trustSystemCertificates()
         {
             return new TrustStrategy( Strategy.TRUST_SYSTEM_CA_SIGNED_CERTIFICATES );
         }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public static TrustStrategy trustCustomCertificateSignedBy( File certFile )`
`354`	`354`	`return new TrustStrategy( Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES, certFile );`
`355`	`355`	`}`
`356`	`356`
`357`		`- public static TrustStrategy trustSystemCertifcates()`
	`357`	`+ public static TrustStrategy trustSystemCertificates()`
`358`	`358`	`{`
`359`	`359`	`return new TrustStrategy( Strategy.TRUST_SYSTEM_CA_SIGNED_CERTIFICATES );`
`360`	`360`	`}`