You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2023/01/03 21:20:51 UTC

[tinkerpop] branch 3.6-dev updated (f420a03ad0 -> 891e38ff91)

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

xiazcy pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from f420a03ad0 Merge branch '3.5-dev' into 3.6-dev
     add fb7d0cc1b5 Add default LICENSE and NOTICE files for gremlin-go. (#1922)
     new 891e38ff91 Merge branch '3.5-dev' into 3.6-dev

The 1 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:
 LICENSE                               | 4 ++--
 {docs/gremlint => gremlin-go}/LICENSE | 0
 {gremlin-dotnet => gremlin-go}/NOTICE | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 copy {docs/gremlint => gremlin-go}/LICENSE (100%)
 copy {gremlin-dotnet => gremlin-go}/NOTICE (100%)


[tinkerpop] 01/01: Merge branch '3.5-dev' into 3.6-dev

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

xiazcy pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 891e38ff9131766671c78d6bf33a6bbcf104552f
Merge: f420a03ad0 fb7d0cc1b5
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Tue Jan 3 13:20:04 2023 -0800

    Merge branch '3.5-dev' into 3.6-dev

 LICENSE                       |  4 ++--
 LICENSE => gremlin-go/LICENSE | 13 +------------
 gremlin-go/NOTICE             |  5 +++++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --cc LICENSE
index d745f0f0e8,f66424df9e..1e747a92fb
--- a/LICENSE
+++ b/LICENSE
@@@ -207,7 -207,7 +207,7 @@@ MIT License
  
  The Apache TinkerPop project bundles the following components under the MIT License:
  
-      bootstrap 5.0.0 (http://getbootstrap.com/) - for details, see license/bootstrap
-      jquery 1.11.0 (https://jquery.com/) - for details, see license/jquery
 -     bootstrap/carousel 3.3.5 (http://getbootstrap.com/) - for details, see licenses/bootstrap
++     bootstrap 5.0.0 (http://getbootstrap.com/) - for details, see licenses/bootstrap
+      jquery 1.11.0 (https://jquery.com/) - for details, see licenses/jquery
       normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
 -     prism.css/js (http://prismjs.com) - for details, see licenses/prism
 +     prism.css/js 1.27.0 (http://prismjs.com) - for details, see licenses/prism