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

Branch: refs/heads/tp33
Commit: d62e50e5c13fcfe6fcd7958727500816c382a200
Parents: 3797c7d f80a542
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 12 10:04:28 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 12 10:04:28 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a29ccf0,da50996..cf1e039
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,10 @@@ limitations under the License
          <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
          <jcabi.version>1.1</jcabi.version>
          <metrics.version>3.0.2</metrics.version>
-         <netty.version>4.0.53.Final</netty.version>
+         <netty.version>4.0.56.Final</netty.version>
          <slf4j.version>1.7.21</slf4j.version>
          <snakeyaml.version>1.15</snakeyaml.version>
 -        <spark.version>1.6.1</spark.version>
 +        <spark.version>2.2.0</spark.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

Reply via email to