commit 744852b6dc24b3436d33045333c4b5aadd6509d3
author Stephen Mallette <spmva@genoprime.com> Mon Jul 25 12:19:57 2016 -0400
committer Stephen Mallette <spmva@genoprime.com> Mon Jul 25 12:19:57 2016 -0400
tree 40e33bf9540901ba36f60a01fdf757e61dcba2ad
parent 9913d64cd1f9050b3d047b59dcea34ee8507d2dd
parent 6be28270598862a7a92b88a67d18e5e8f198b92b

Merge remote-tracking branch 'origin/tp31'

Conflicts:
	gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java

CHANGELOG.asciidoc

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index eb25c73..2714469 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -317,6 +317,12 @@
 
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
+[[release-3-1-4]]
+TinkerPop 3.1.4 (NOT OFFICIALLY RELEASED YET)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
+
 [[release-3-1-3]]
 TinkerPop 3.1.3 (Release Date: July 18, 2016)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~