tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [10/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-741' into tp32
Date Wed, 28 Jun 2017 19:13:55 GMT
Merge branch 'TINKERPOP-741' into tp32

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/aa81313b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa81313b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aa81313b

Branch: refs/heads/TINKERPOP-1552
Commit: aa81313ba1e031f895c02529573bffd79a999d9c
Parents: 9436585 eba0a2c
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Jun 28 13:32:11 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Jun 28 13:32:11 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/reference/the-graph.asciidoc           | 20 --------------------
 .../gremlin/structure/Transaction.java          |  4 ++++
 .../structure/util/AbstractTransaction.java     |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 9da8d47,bfb7aa9..ba9f2a7
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,11 -28,9 +28,12 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <<release-3-1-8, 3.1.8>>.
  
 +* Added annotations to the traversal metrics pretty print.
 +* `EdgeVertexStep` is no longer final and can be extended by providers.
+ * Deprecated `Transaction.submit(Function)`.
  * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
  * Improved GraphSON serialization performance around `VertexProperty`.
 +* Changed some tests in `EventStrategyProcessTest` which were enforcing some unintended
semantics around transaction state.
  
  [[release-3-2-5]]
  TinkerPop 3.2.5 (Release Date: June 12, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa81313b/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------


Mime
View raw message