You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/09/20 19:49:48 UTC
[1/2] tinkerpop git commit: Fixed bad links in javadoc CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 096271390 -> 84777d4a0
Fixed bad links in javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/af73f45a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/af73f45a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/af73f45a
Branch: refs/heads/tp33
Commit: af73f45ad1afd94d984bd144523060fc948cb234
Parents: 0eec0c5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 20 15:47:58 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 20 15:47:58 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af73f45a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 7ae8d2d..33ff574 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -656,7 +656,7 @@ public final class Cluster {
/**
* File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and
* SSL is enabled, the default {@link TrustManager} will be used.
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public Builder trustCertificateChainFile(final String certificateChainFile) {
@@ -676,7 +676,7 @@ public final class Cluster {
/**
* The X.509 certificate chain file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyCertChainFile(final String keyCertChainFile) {
@@ -686,7 +686,7 @@ public final class Cluster {
/**
* The PKCS#8 private key file in PEM format.
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public Builder keyFile(final String keyFile) {
@@ -696,7 +696,7 @@ public final class Cluster {
/**
* The password of the {@link #keyFile}, or {@code null} if it's not password-protected.
- * @deprecated As of release 3.2.10, replaced by {@link keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStorePassword}
*/
@Deprecated
public Builder keyPassword(final String keyPassword) {
@@ -738,7 +738,7 @@ public final class Cluster {
}
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code PKCS12}
*/
public Builder keyStoreType(final String keyStoreType) {
this.keyStoreType = keyStoreType;
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84777d4a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84777d4a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84777d4a
Branch: refs/heads/tp33
Commit: 84777d4a0189a37e9448154c484803f6870d80f8
Parents: 0962713 af73f45
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 20 15:48:17 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 20 15:48:17 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84777d4a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------