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/TINKERPOP-1888
Commit: 4455a1d89433b629b6c38d10a2f871a3f5f210fb
Parents: 93a6434 20bc886
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 6 20:06:33 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
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
<Authors>Apache TinkerPop</Authors>
<Description>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.
