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 2017/05/11 10:52:54 UTC

[1/3] tinkerpop git commit: Minor javadoc fixup

Repository: tinkerpop
Updated Branches:
  refs/heads/master a74fa0a58 -> 0ba09a8ee


Minor javadoc fixup


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4c0c5a9e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4c0c5a9e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4c0c5a9e

Branch: refs/heads/master
Commit: 4c0c5a9e58863188b2f1bc359f348d572d42cf4f
Parents: 9d8820c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 11 06:52:07 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 11 06:52:07 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c0c5a9e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index 83e68e1..6fcf8c2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -618,11 +618,11 @@ public interface Graph extends AutoCloseable, Host {
             }
 
             /**
-             * Determines if an {@link Element} can have a user defined identifier.  Implementation that do not support
+             * Determines if an {@link Element} can have a user defined identifier.  Implementations that do not support
              * this feature will be expected to auto-generate unique identifiers.  In other words, if the {@link Graph}
              * allows {@code graph.addVertex(id,x)} to work and thus set the identifier of the newly added
              * {@link Vertex} to the value of {@code x} then this feature should return true.  In this case, {@code x}
-             * is assumed to be an identifier datat ype that the {@link Graph} will accept.
+             * is assumed to be an identifier data type that the {@link Graph} will accept.
              */
             @FeatureDescriptor(name = FEATURE_USER_SUPPLIED_IDS)
             public default boolean supportsUserSuppliedIds() {


[2/3] tinkerpop git commit: Merge branch 'tp31' into tp32

Posted by sp...@apache.org.
Merge branch 'tp31' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02b0e12f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02b0e12f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02b0e12f

Branch: refs/heads/master
Commit: 02b0e12fec5b5ea4f3db45a96ca6b6e181ff86e9
Parents: 38289c8 4c0c5a9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 11 06:52:31 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 11 06:52:31 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02b0e12f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------


[3/3] tinkerpop git commit: Merge branch 'tp32'

Posted by sp...@apache.org.
Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ba09a8e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ba09a8e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0ba09a8e

Branch: refs/heads/master
Commit: 0ba09a8ee5f6a2f8ca7fe8231fb687315c62f51b
Parents: a74fa0a 02b0e12
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 11 06:52:42 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 11 06:52:42 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0ba09a8e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------