You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/26 13:53:40 UTC
[incubator-skywalking] branch mysql-style updated (fbda430 -> 8aa8045)

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

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


    from fbda430  Make default back to ElasticSearch in dev mode.
     add 578fd70  fixed bug: multiple formatIndexName in forceUpdate method (#1960)
     add b790307  feat:Active System.env Config In Both Collector And agent.config. (#1957)
     add 0d4703c  Update README.md (#1963)
     add 5819515  add system env in docker configuration (#1962)
     add 8aa8045  Merge branch 'master' into mysql-style

No new revisions were added by this update.

Summary of changes:
 apm-commons/apm-util/pom.xml                       |  1 -
 .../apm}/util/PlaceholderConfigurerSupport.java    |  2 +-
 .../apm}/util/PropertyPlaceholderHelper.java       | 34 ++++-----
 .../org/apache/skywalking/apm/util/StringUtil.java | 12 ++++
 apm-sniffer/apm-agent-core/pom.xml                 | 10 ++-
 .../skywalking/apm/agent/core/conf/Config.java     | 12 ++--
 .../agent/core/conf/SnifferConfigInitializer.java  | 17 ++++-
 .../core/conf/SnifferConfigInitializerTest.java    | 38 ++++++++--
 apm-sniffer/config/agent.config                    | 18 ++---
 docker/config/application.yml                      | 82 ++++++++++++----------
 docs/en/setup/README.md                            |  6 +-
 docs/en/setup/service-agent/java-agent/README.md   | 30 ++++++++
 .../service-agent/java-agent/Setting-override.md   | 22 +++++-
 .../client/elasticsearch/ElasticSearchClient.java  |  2 -
 oap-server/server-library/library-util/pom.xml     |  6 +-
 .../oap/server/library/util/StringUtils.java       | 12 ----
 .../util/PropertyPlaceholderHelperTest.java        |  2 +
 .../starter/config/ApplicationConfigLoader.java    |  4 +-
 18 files changed, 210 insertions(+), 100 deletions(-)
 rename {oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library => apm-commons/apm-util/src/main/java/org/apache/skywalking/apm}/util/PlaceholderConfigurerSupport.java (95%)
 rename {oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library => apm-commons/apm-util/src/main/java/org/apache/skywalking/apm}/util/PropertyPlaceholderHelper.java (87%)