Merge branch '1.2' into 1.3

neo4j · Apr 27, 2017 · 0c43970 · 0c43970
2 parents 17cc5de + 5fe27d7
commit 0c43970
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/Neo4j.Driver/Neo4j.Driver/V1/Config.cs b/Neo4j.Driver/Neo4j.Driver/V1/Config.cs
@@ -134,7 +134,7 @@ static Config()
         /// Any negative <see cref="TimeSpan"/> value will be considered to be "Infinite",
         /// a.k.a. pooled connections will never be stale.
         /// </summary>
-        public TimeSpan ConnectionIdleTimeout { get; set; } = Infinite;
+        internal TimeSpan ConnectionIdleTimeout { get; set; } = Infinite;
 
         /// <summary>
         /// Gets or sets the connections to support ipv6 addresses.
@@ -202,12 +202,6 @@ public IConfigBuilder WithMaxTransactionRetryTime(TimeSpan time)
                 return this;
             }
 
-            public IConfigBuilder WithConnectionIdleTimeout(TimeSpan timeSpan)
-            {
-                _config.ConnectionIdleTimeout = timeSpan;
-                return this;
-            }
-
             public IConfigBuilder WithIpv6Enabled(bool enable)
             {
                 _config.Ipv6Enabled = enable;
@@ -291,15 +285,6 @@ public interface IConfigBuilder
         /// <remarks>Must call <see cref="ToConfig"/> to generate a <see cref="Config"/> instance.</remarks>
         IConfigBuilder WithMaxTransactionRetryTime(TimeSpan time);
 
-        /// <summary>
-        /// Specify the connection idle timeout.
-        /// The connection that has been idled in pool for longer than specified timeout will not be reused but closed.
-        /// </summary>
-        /// <param name="timeSpan">The max timespan that a connection can be reused after has been idle for.</param>
-        /// <returns>An <see cref="IConfigBuilder"/> instance for further configuration options.</returns>
-        /// <remarks>Must call <see cref="ToConfig"/> to generate a <see cref="Config"/> instance.</remarks>
-        IConfigBuilder WithConnectionIdleTimeout(TimeSpan timeSpan);
-
         /// <summary>
         /// Setting this option to true will enable ipv6 on socket connections.
         /// </summary>