[2/6] tinkerpop git commit: Merge branch 'tp32' into tp33

[florianhockmann]

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

Branch: refs/heads/TINKERPOP-1774
Commit: 8af7837286c7eba82c831576a3291c77bfb727e9
Parents: dfe79c2 7fce137
Author: Daniel Kuppitz 
Authored: Wed Aug 1 11:27:04 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Aug 1 11:27:04 2018 -0700

--
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/6] tinkerpop git commit: Merge branch 'tp32' into tp33

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


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

Branch: refs/heads/master
Commit: 4455a1d89433b629b6c38d10a2f871a3f5f210fb
Parents: 93a6434 20bc886
Author: Stephen Mallette 
Authored: Fri Apr 6 20:06:33 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 6 20:06:33 2018 -0400

--
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4455a1d8/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index cb3587a,44a3a10..3bdc0a7
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -32,9 -32,9 +32,9 @@@ limitations under the License
  Apache TinkerPop
  Gremlin.Net for Apache TinkerPop™ is a language variant 
and driver for .NET.
  
--Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP). Gremlin is the graph traversal 
language of TinkerPop. It can be described as a functional, data-flow language 
that enables users to succinctly express complex traversals on (or queries of) 
their application’s property graph.
++Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP). Gremlin is the graph traversal 
language of TinkerPop. It can be described as a functional, data-flow language 
that enables users to succinctly express complex traversals on (or queries of) 
their application's property graph.
  
--Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs 
as Java including “dot notation” for function chaining (a.b.c), round 
bracket function arguments (a(b,c)), and support for global namespaces (a(b()) 
vs a(__.b())). As such, anyone familiar with Gremlin-Java will immediately be 
able to work with Gremlin.Net. Moreover, there are a few added constructs to 
Gremlin.Net that make traversals a bit more succinct.
++Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs 
as Java including "dot notation" for function chaining (a.b.c), round bracket 
function arguments (a(b,c)), and support for global namespaces (a(b()) vs 
a(__.b())). As such, anyone familiar with Gremlin-Java will immediately be able 
to work with Gremlin.Net. Moreover, there are a few added constructs to 
Gremlin.Net that make traversals a bit more succinct.
  
  Please see the reference documentation at Apache TinkerPop for more 
information on usage.