You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/02/28 15:43:07 UTC

[incubator-skywalking] branch master updated (b76b373 -> fc5eada)

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

pengys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from b76b373  Merge pull request #847 from carlvine500/add-http-time-out
     add 196354f  Add apm-backend-dist module
     add 9cb0a53  Convert CRLF to LF
     add cfb6462  Amend bash
     add 28d2911  Merge branch 'master' into module/apm-backend-dist
     new fc5eada  Merge pull request #852 from hanahmily/module/apm-backend-dist

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:
 .../bin/collectorService.bat                       |   2 +-
 .../bin/collectorService.sh                        |   2 +-
 .../bin/startup.bat                                |   1 +
 apm-backend-dist/bin/startup.sh                    |  10 ++
 apm-backend-dist/bin/webappService.bat             |  18 +++
 apm-backend-dist/bin/webappService.sh              |  27 +++++
 apm-backend-dist/pom.xml                           |  77 +++++++++++++
 .../src/main/assembly/binary.xml                   | 125 ++++++++++-----------
 apm-collector/apm-collector-boot/bin/startup.sh    |   7 --
 apm-collector/apm-collector-boot/pom.xml           |  21 +---
 .../src/main/assembly/assembly.xml                 |  12 +-
 pom.xml                                            |   1 +
 12 files changed, 196 insertions(+), 107 deletions(-)
 rename {apm-collector/apm-collector-boot => apm-backend-dist}/bin/collectorService.bat (89%)
 rename {apm-collector/apm-collector-boot => apm-backend-dist}/bin/collectorService.sh (94%)
 rename {apm-collector/apm-collector-boot => apm-backend-dist}/bin/startup.bat (65%)
 create mode 100644 apm-backend-dist/bin/startup.sh
 create mode 100644 apm-backend-dist/bin/webappService.bat
 create mode 100644 apm-backend-dist/bin/webappService.sh
 create mode 100644 apm-backend-dist/pom.xml
 copy apm-collector/apm-collector-boot/src/main/assembly/assembly.xml => apm-backend-dist/src/main/assembly/binary.xml (68%)
 delete mode 100644 apm-collector/apm-collector-boot/bin/startup.sh

-- 
To stop receiving notification emails like this one, please contact
pengys@apache.org.

[incubator-skywalking] 01/01: Merge pull request #852 from hanahmily/module/apm-backend-dist

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

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

commit fc5eadae3930007f4fc8444cd7c6f687674b93c0
Merge: b76b373 28d2911
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Wed Feb 28 23:43:03 2018 +0800

    Merge pull request #852 from hanahmily/module/apm-backend-dist
    
    Module/apm backend dist

 .../bin/collectorService.bat                       |   2 +-
 .../bin/collectorService.sh                        |   2 +-
 .../bin/startup.bat                                |   1 +
 apm-backend-dist/bin/startup.sh                    |  10 ++
 apm-backend-dist/bin/webappService.bat             |  18 +++
 apm-backend-dist/bin/webappService.sh              |  27 +++++
 apm-backend-dist/pom.xml                           |  77 +++++++++++++
 .../src/main/assembly/binary.xml                   | 125 ++++++++++-----------
 apm-collector/apm-collector-boot/bin/startup.sh    |   7 --
 apm-collector/apm-collector-boot/pom.xml           |  21 +---
 .../src/main/assembly/assembly.xml                 |  12 +-
 pom.xml                                            |   1 +
 12 files changed, 196 insertions(+), 107 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
pengys@apache.org.