You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/12/03 18:59:17 UTC

[tinkerpop] branch master updated (ec13939 -> 4ebb41c)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from ec13939  Merge branch 'tp33'
     add b8856c6  TINKERPOP-2018 Automated documentation generation for .NET with docfx
     add abcfce6  TINKERPOP-2018 Fixed header images and other settings
     add 8e275fa  TINKERPOP-2018 Integrated .NET docs in publish script.
     add f4e87b7  TINKERPOP-2018 Add note about nuget requirements
     new d53c1bd  Merge branch 'TINKERPOP-2018' into tp33
     new 4ebb41c  Merge branch 'tp33'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/publish-docs.sh                                |  17 ++++++
 gremlin-dotnet/src/.gitignore                      |   3 +
 gremlin-dotnet/src/docfx.json                      |  41 +++++++++++++
 gremlin-dotnet/src/images/favicon.ico              | Bin 0 -> 1595 bytes
 gremlin-dotnet/src/images/tinkerpop-character.png  | Bin 0 -> 5082 bytes
 gremlin-dotnet/{README.md => src/index.md}         |   0
 gremlin-dotnet/src/pom.xml                         |  64 +++++++++++++++++++++
 .../src/toc.yml                                    |  11 ++--
 pom.xml                                            |   1 +
 9 files changed, 130 insertions(+), 7 deletions(-)
 create mode 100644 gremlin-dotnet/src/.gitignore
 create mode 100644 gremlin-dotnet/src/docfx.json
 create mode 100755 gremlin-dotnet/src/images/favicon.ico
 create mode 100644 gremlin-dotnet/src/images/tinkerpop-character.png
 copy gremlin-dotnet/{README.md => src/index.md} (100%)
 copy gremlin-console/src/main/docker/docker-entrypoint.sh => gremlin-dotnet/src/toc.yml (91%)
 mode change 100755 => 100644


[tinkerpop] 01/02: Merge branch 'TINKERPOP-2018' into tp33

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d53c1bd968adc3935f7675289d7e2478e872caf1
Merge: f04ada1 f4e87b7
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Dec 3 13:57:35 2018 -0500

    Merge branch 'TINKERPOP-2018' into tp33

 bin/publish-docs.sh                               |  29 ++++++++--
 gremlin-dotnet/src/.gitignore                     |   3 +
 gremlin-dotnet/src/docfx.json                     |  41 ++++++++++++++
 gremlin-dotnet/src/images/favicon.ico             | Bin 0 -> 1595 bytes
 gremlin-dotnet/src/images/tinkerpop-character.png | Bin 0 -> 5082 bytes
 gremlin-dotnet/src/index.md                       |  40 ++++++++++++++
 gremlin-dotnet/src/pom.xml                        |  64 ++++++++++++++++++++++
 gremlin-dotnet/src/toc.yml                        |  21 +++++++
 pom.xml                                           |   1 +
 9 files changed, 195 insertions(+), 4 deletions(-)


[tinkerpop] 02/02: Merge branch 'tp33'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 4ebb41c1585b39ae84596914bedd27a5de0840e2
Merge: ec13939 d53c1bd
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Dec 3 13:59:04 2018 -0500

    Merge branch 'tp33'
    
    Conflicts:
    	bin/publish-docs.sh

 bin/publish-docs.sh                               |  17 ++++++
 gremlin-dotnet/src/.gitignore                     |   3 +
 gremlin-dotnet/src/docfx.json                     |  41 ++++++++++++++
 gremlin-dotnet/src/images/favicon.ico             | Bin 0 -> 1595 bytes
 gremlin-dotnet/src/images/tinkerpop-character.png | Bin 0 -> 5082 bytes
 gremlin-dotnet/src/index.md                       |  40 ++++++++++++++
 gremlin-dotnet/src/pom.xml                        |  64 ++++++++++++++++++++++
 gremlin-dotnet/src/toc.yml                        |  21 +++++++
 pom.xml                                           |   1 +
 9 files changed, 187 insertions(+)