You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ab...@apache.org on 2019/04/22 07:32:34 UTC

[incubator-zipkin-website] 01/01: Merge pull request #2 from apache/sync-from-githubio

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

abesto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-website.git

commit 1a9b934c86cb191cdc97d0fe3088eb9f5f853ac2
Merge: 5270739 641d27a
Author: Zoltán Nagy <ab...@gmail.com>
AuthorDate: Mon Apr 22 08:32:29 2019 +0100

    Merge pull request #2 from apache/sync-from-githubio
    
    Sync changes from openzipkin/openzipkin.github.io

 Gemfile                                            |  1 +
 Gemfile.lock                                       | 33 ++++++------
 README.md                                          |  4 +-
 _data/community_extensions.yml                     | 18 +++++++
 ...s.yml => community_tracers_instrumentation.yml} | 62 +++++++++++++++++++++-
 _data/openzipkin_extensions.yml                    | 50 +++++++++++++++++
 ....yml => openzipkin_tracers_instrumentation.yml} |  0
 docker-compose.yml                                 |  9 ++++
 index.md                                           |  4 +-
 pages/architecture.md                              |  4 +-
 pages/community.md                                 |  4 +-
 pages/extensions_choices.md                        | 55 +++++++++++++++++++
 pages/instrumenting.md                             |  2 +-
 ...trumentations.md => tracers_instrumentation.md} | 14 ++---
 14 files changed, 227 insertions(+), 33 deletions(-)