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 2019/10/12 12:47:49 UTC
[skywalking] branch master updated (f452966 -> fb00186)

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

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


    from f452966  ADD deepblue in powered-by.md (#3604)
     add fb00186  Instead of datasource-settings.properties, use application.yml for MySQLStorageProvider (#3564)

No new revisions were added by this update.

Summary of changes:
 docker/oap/docker-entrypoint.sh                    | 10 +++-
 docs/en/setup/backend/backend-storage.md           | 29 ++++++---
 .../oap/server/library/module/ModuleDefine.java    |  8 +--
 oap-server/server-starter/pom.xml                  |  1 -
 .../src/main/assembly/application.yml              | 10 +++-
 .../server-starter/src/main/assembly/assembly.xml  |  1 -
 .../main/assembly/datasource-settings.properties   | 31 ----------
 .../starter/config/ApplicationConfigLoader.java    | 41 ++++++++-----
 .../src/main/resources/application.yml             | 10 +++-
 .../main/resources/datasource-settings.properties  | 31 ----------
 .../config/ApplicationConfigLoaderTestCase.java    | 52 ++++++++++++++++
 .../src/{main => test}/resources/application.yml   | 37 ++++--------
 .../plugin/jdbc/mysql/MySQLStorageConfig.java}     | 21 +++----
 .../plugin/jdbc/mysql/MySQLStorageProvider.java    | 69 ++++++++++++++--------
 14 files changed, 198 insertions(+), 153 deletions(-)
 delete mode 100644 oap-server/server-starter/src/main/assembly/datasource-settings.properties
 delete mode 100755 oap-server/server-starter/src/main/resources/datasource-settings.properties
 create mode 100644 oap-server/server-starter/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java
 copy oap-server/server-starter/src/{main => test}/resources/application.yml (81%)
 copy oap-server/{server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java} (76%)