Merge branch 'TINKERPOP-1445'

Conflicts:
        CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1698
Commit: 7d2b46b0f25471d7648e74c15afeb0653d05c084
Parents: 77c0477 47afd7a
Author: Stephen Mallette <[email protected]>
Authored: Mon Jun 26 10:18:12 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Jun 26 10:18:12 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../gremlin/structure/util/StringFactory.java   |  9 +++----
 .../gremlin/structure/PropertyTest.java         | 28 +++++++++++++++++++-
 3 files changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7d2b46b0/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 4e4844c,eb8ad8a..c34b3ff
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,7 +26,9 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
 +* `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
+ * Included an ellipse on long property names that are truncated.
  * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
  * Added more specific typing to various `__` traversal steps. E.g. 
`<A,Vertex>out()` is `<Vertex,Vertex>out()`.
  * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

Reply via email to