tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [21/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Date Mon, 27 Feb 2017 12:49:24 GMT
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/2e64a952
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2e64a952
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2e64a952

Branch: refs/heads/TINKERPOP-1612
Commit: 2e64a95219150169e91757e13f005bac3b7297d0
Parents: c5b9680 de38c6d
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Feb 27 07:04:57 2017 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Mon Feb 27 07:04:57 2017 -0500

----------------------------------------------------------------------
 NOTICE                                 | 4 ++--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e64a952/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index 81ee6a5,4285c37..ea814f4
--- a/NOTICE
+++ b/NOTICE
@@@ -12,14 -12,4 +12,14 @@@ Copyright 2010-2014 Alfresco Software, 
  
  gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
  contains DelegatingXMLStreamWriter.java and IndentingXMLStreamWriter.java from
 -modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/
 +https://github.com/Activiti/Activiti/tree/activiti-5.16/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter
 +
 +------------------------------------------------------------------------
 +Apache Kerby
 +------------------------------------------------------------------------
 +Apache Kerby
 +Copyright 2015-2016 The Apache Software Foundation
 +
 +gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
 +from
- https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
++https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java


Mime
View raw message