Author: markt
Date: Fri Dec 14 11:33:28 2018
New Revision: 1848928
URL: http://svn.apache.org/viewvc?rev=1848928=rev
Log:
Fixes from woonsan
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
Author: markt
Date: Fri Dec 14 09:36:20 2018
New Revision: 1848919
URL: http://svn.apache.org/viewvc?rev=1848919=rev
Log:
Update site for 9.0.14 release
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
Author: markt
Date: Fri Dec 14 10:09:15 2018
New Revision: 1848920
URL: http://svn.apache.org/viewvc?rev=1848920=rev
Log:
Fixes from woonsan
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
Author: markt
Date: Fri Dec 14 11:07:49 2018
New Revision: 1848925
URL: http://svn.apache.org/viewvc?rev=1848925=rev
Log:
Remove English entries from Spanish file. Tomcat falls back to English by
default.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
Author: markt
Date: Fri Dec 14 09:16:15 2018
New Revision: 1848917
URL: http://svn.apache.org/viewvc?rev=1848917=rev
Log:
Fixes from woonsan
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
Author: markt
Date: Fri Dec 14 09:33:39 2018
New Revision: 1848918
URL: http://svn.apache.org/viewvc?rev=1848918=rev
Log:
Update docs for 9.0.14
[This commit notification would consist of 83 parts,
which exceeds the limit of 50 ones, so it was shortened to the summary.]
Author: markt
Date: Fri Dec 14 09:37:36 2018
New Revision: 31536
Log:
Drop 9.0.13 from mirrors
Removed:
release/tomcat/tomcat-9/v9.0.13/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands,
Hi Mark,
*JDK 12 Early Access build **is now available **at : - jdk.java.net/12/*
* Per the JDK 12 schedule [1], we are now in Rampdown Phase One.
o For more details , see Mark Reinhold's email to jdk-dev mailing
list [2]
o The overall feature set is frozen, no further JEPs
Author: markt
Date: Fri Dec 14 09:13:16 2018
New Revision: 31535
Log:
Drop 9.0.12 from the mirror network
Removed:
release/tomcat/tomcat-9/v9.0.12/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
All,
Is this bad enough to pull and re-roll the latest 8.5.x release?
Missing Content-Type is ... pretty bad.
- -chris
On 12/14/18 12:39, bugzi...@apache.org wrote:
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63009
>
> Mark Thomas changed:
On Fri, Dec 14, 2018 at 11:05 PM Caldarale, Charles R <
chuck.caldar...@unisys.com> wrote:
> > From: Christopher Schultz [mailto:ch...@christopherschultz.net]
> > Subject: Re: [Bug 63009] Content-Length header is dropped when HTTP2 is
> used
>
> > Is this bad enough to pull and re-roll the latest
> From: Christopher Schultz [mailto:ch...@christopherschultz.net]
> Subject: Re: [Bug 63009] Content-Length header is dropped when HTTP2 is
used
> Is this bad enough to pull and re-roll the latest 8.5.x release?
> Missing Content-Type is ... pretty bad.
The fix was for a missing (and optional)
Author: remm
Date: Fri Dec 14 13:37:45 2018
New Revision: 1848938
URL: http://svn.apache.org/viewvc?rev=1848938=rev
Log:
Add dns-ping support to enumerate cluster members. This is much simpler
than getting the pod list but it does not indicate pod status.
Submitted by by Maxime Beck.
The Buildbot has detected a restored build on builder tomcat-trunk while
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3919
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The AnyBranchScheduler
Author: markt
Date: Fri Dec 14 12:58:33 2018
New Revision: 1848936
URL: http://svn.apache.org/viewvc?rev=1848936=rev
Log:
Fixes from woonsan
Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
The Buildbot has detected a new failure on builder tomcat-trunk while building
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3918
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The AnyBranchScheduler
Author: markt
Date: Fri Dec 14 12:44:13 2018
New Revision: 1848935
URL: http://svn.apache.org/viewvc?rev=1848935=rev
Log:
Ensure TLS socket is closed when normal closure fails.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Author: csutherl
Date: Sat Dec 15 00:42:32 2018
New Revision: 1848972
URL: http://svn.apache.org/viewvc?rev=1848972=rev
Log:
Temporary fix for links in nav pane. For some reason the update I made doesn't
correctly utilize the project.xml from each subdirectory and only uses the top
level one
Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html?rev=1848973=1848972=1848973=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html?rev=1848973=1848972=1848973=diff
==
---
Modified:
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/workers.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/printer/workers.html?rev=1848973=1848972=1848973=diff
Modified: tomcat/site/trunk/docs/connectors-doc/news/20160901.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20160901.html?rev=1848973=1848972=1848973=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/jkstatustasks.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/jkstatustasks.html?rev=1848973=1848972=1848973=diff
==
Author: csutherl
Date: Sat Dec 15 00:45:30 2018
New Revision: 1848973
URL: http://svn.apache.org/viewvc?rev=1848973=rev
Log:
Update links in nav bar per r1848972
Modified:
tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13a.html
tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13ext.html
Modified: tomcat/site/trunk/docs/connectors-doc/news/20060101.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20060101.html?rev=1848973=1848972=1848973=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/news/printer/20110701.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/printer/20110701.html?rev=1848973=1848972=1848973=diff
==
---
https://bz.apache.org/bugzilla/show_bug.cgi?id=63009
--- Comment #1 from Mark Thomas ---
Sending the content-length header is optional in HTTP/2. See section 8.1.2.6 of
RFC 7540:
"A request or response that includes a payload body can include a
content-length header field."
The header is not
Author: markt
Date: Fri Dec 14 15:00:13 2018
New Revision: 1848944
URL: http://svn.apache.org/viewvc?rev=1848944=rev
Log:
Better name for term (woonsan)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
==
Author: markt
Date: Fri Dec 14 15:07:58 2018
New Revision: 1848948
URL: http://svn.apache.org/viewvc?rev=1848948=rev
Log:
Update Korean translations
Added:
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_ko.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
==
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ko.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ko.properties?rev=1848948=1848947=1848948=diff
==
Author: markt
Date: Fri Dec 14 15:10:36 2018
New Revision: 1848950
URL: http://svn.apache.org/viewvc?rev=1848950=rev
Log:
Update Japanese translations
Added:
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings_ja.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ja.properties?rev=1848950=1848949=1848950=diff
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties?rev=1848950=1848949=1848950=diff
Author: markt
Date: Fri Dec 14 15:12:40 2018
New Revision: 1848952
URL: http://svn.apache.org/viewvc?rev=1848952=rev
Log:
Update German translations
Added:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_de.properties
(with props)
On 14/12/2018 10:47, Rory O'Donnell wrote:
> Hi Mark,
>
> *JDK 12 Early Access build **is now available **at : - jdk.java.net/12/*
>
> * Per the JDK 12 schedule [1], we are now in Rampdown Phase One.
> o For more details , see Mark Reinhold's email to jdk-dev mailing
> list [2]
>
Author: markt
Date: Fri Dec 14 15:00:53 2018
New Revision: 1848945
URL: http://svn.apache.org/viewvc?rev=1848945=rev
Log:
Remove unused term
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified:
Author: markt
Date: Fri Dec 14 15:05:40 2018
New Revision: 1848946
URL: http://svn.apache.org/viewvc?rev=1848946=rev
Log:
Update French translations
Added:
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings_fr.properties
(with props)
Author: markt
Date: Fri Dec 14 15:11:29 2018
New Revision: 1848951
URL: http://svn.apache.org/viewvc?rev=1848951=rev
Log:
Update Chinese (Simplified) translations
Added:
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
(with props)
Modified:
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ja.properties?rev=1848950=1848949=1848950=diff
==
---
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties?rev=1848950=1848949=1848950=diff
The Buildbot has detected a restored build on builder tomcat-85-trunk while
building . Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1581
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The
The Buildbot has detected a restored build on builder tomcat-trunk while
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3924
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The AnyBranchScheduler
Hi,
I made a bunch of changes to the JK site yesterday so that it uses the
updated Tomcat site's stylesheets to unify the UI between the two project
sites. Unfortunately, I can't figure out how to deploy it. The
HOWTO-RELEASE.txt doc says to copy the build/docs output
to
On 14/12/2018 17:16, Coty Sutherland wrote:
> Hi,
>
> I made a bunch of changes to the JK site yesterday so that it uses the
> updated Tomcat site's stylesheets to unify the UI between the two project
> sites.
A very welcome change.
> Unfortunately, I can't figure out how to deploy it. The
>
Author: markt
Date: Fri Dec 14 17:36:46 2018
New Revision: 1848963
URL: http://svn.apache.org/viewvc?rev=1848963=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63009
Include the optional content-length header in HTTP/2 responses where an
appropriate value is available.
Modified:
Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/doccontrib.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/doccontrib.html?rev=1848964=1848963=1848964=diff
==
---
Modified:
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html?rev=1848964=1848963=1848964=diff
Author: csutherl
Date: Fri Dec 14 17:45:49 2018
New Revision: 1848964
URL: http://svn.apache.org/viewvc?rev=1848964=rev
Log:
Update jk-site to reflect changes made in xdocs in r1848904
Added:
tomcat/site/trunk/docs/connectors-doc/images/asf-logo.svg (with props)
Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html?rev=1848964=1848963=1848964=diff
==
---
Modified:
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/doccontrib.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/doccontrib.html?rev=1848964=1848963=1848964=diff
Modified: tomcat/site/trunk/docs/connectors-doc/news/printer/20081001.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/printer/20081001.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/reference/iis.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/iis.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/news/20160901.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20160901.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/reference/workers.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/workers.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/workers.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/workers.html?rev=1848964=1848963=1848964=diff
==
---
Modified:
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/workers.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/printer/workers.html?rev=1848964=1848963=1848964=diff
Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/iis.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/iis.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/iis.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/iis.html?rev=1848964=1848963=1848964=diff
==
Modified: tomcat/site/trunk/docs/connectors-doc/reference/status.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/status.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/news/20090301.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20090301.html?rev=1848964=1848963=1848964=diff
==
---
On 14/12/2018 17:45, csuth...@apache.org wrote:
> Author: csutherl
> Date: Fri Dec 14 17:45:49 2018
> New Revision: 1848964
>
> URL: http://svn.apache.org/viewvc?rev=1848964=rev
> Log:
> Update jk-site to reflect changes made in xdocs in r1848904
Nice.
Mark
On 14/12/2018 17:52, build...@apache.org wrote:
> The Buildbot has detected a new failure on builder tomcat-trunk while
> building . Full details are available at:
> https://ci.apache.org/builders/tomcat-trunk/builds/3923
>
> Buildbot URL: https://ci.apache.org/
>
> Buildslave for this
The Buildbot has detected a new failure on builder tomcat-85-trunk while
building . Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1580
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The AnyBranchScheduler
Thanks!
On Fri, Dec 14, 2018 at 12:22 PM Mark Thomas wrote:
> On 14/12/2018 17:16, Coty Sutherland wrote:
> > Hi,
> >
> > I made a bunch of changes to the JK site yesterday so that it uses the
> > updated Tomcat site's stylesheets to unify the UI between the two project
> > sites.
>
> A very
Author: markt
Date: Fri Dec 14 17:26:08 2018
New Revision: 1848959
URL: http://svn.apache.org/viewvc?rev=1848959=rev
Log:
Include the optional content-length header in HTTP/2 responses where an
appropriate value is available.
Modified:
https://bz.apache.org/bugzilla/show_bug.cgi?id=54802
Mark Thomas changed:
What|Removed |Added
Resolution|--- |FIXED
Status|NEW
Modified:
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html?rev=1848964=1848963=1848964=diff
Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/common_howto/timeouts.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/timeouts.html?rev=1848964=1848963=1848964=diff
==
---
Modified:
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/loadbalancers.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/printer/loadbalancers.html?rev=1848964=1848963=1848964=diff
Modified: tomcat/site/trunk/docs/connectors-doc/reference/apache.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/apache.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/ajp/printer/ajpv13a.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/ajp/printer/ajpv13a.html?rev=1848964=1848963=1848964=diff
==
---
Modified: tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html?rev=1848964=1848963=1848964=diff
==
---
https://bz.apache.org/bugzilla/show_bug.cgi?id=63009
Mark Thomas changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|---
The Buildbot has detected a new failure on builder tomcat-trunk while building
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3923
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: silvanus_ubuntu
Build Reason: The AnyBranchScheduler
Author: markt
Date: Fri Dec 14 18:50:58 2018
New Revision: 1848966
URL: http://svn.apache.org/viewvc?rev=1848966=rev
Log:
Fix failing HTTP/2 tests after content-length change
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Author: markt
Date: Fri Dec 14 18:53:39 2018
New Revision: 1848967
URL: http://svn.apache.org/viewvc?rev=1848967=rev
Log:
Fix failing HTTP/2 tests after content-length change
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
86 matches
Mail list logo