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/04/22 08:16:21 UTC
[incubator-skywalking] branch protocol/ui-beta updated (c8b0e04 ->
f916fbe)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a change to branch protocol/ui-beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from c8b0e04 Merge branch 'master' into protocol/ui-beta
add e736102 Fixed #1090 (#1101)
new f916fbe Merge branch 'master' into protocol/ui-beta
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:
.../apm/collector/boot/CollectorBootStartUp.java | 3 +-
.../client/elasticsearch/ElasticSearchClient.java | 75 +++++++---------------
.../ElasticSearchClientException.java | 9 +--
.../ElasticSearchClientNotReadyException.java | 29 ---------
.../apm/collector/core/module/BootstrapFlow.java | 3 +-
.../apm/collector/core/module/ModuleManager.java | 2 +-
.../apm/collector/core/module/ModuleProvider.java | 2 +-
...figException.java => ModuleStartException.java} | 4 +-
.../collector/core/module/ModuleManagerTest.java | 3 +-
.../collector/storage/StorageInstallException.java | 1 -
.../apm/collector/storage/StorageInstaller.java | 27 ++++++--
.../storage/es/StorageModuleEsProvider.java | 14 ++--
.../base/define/ElasticSearchStorageInstaller.java | 48 ++++++++++----
.../storage/h2/StorageModuleH2Provider.java | 2 +-
.../storage/h2/base/define/H2StorageInstaller.java | 14 ++--
15 files changed, 105 insertions(+), 131 deletions(-)
delete mode 100644 apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientNotReadyException.java
copy apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/{ModuleConfigException.java => ModuleStartException.java} (88%)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
protocol/ui-beta
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch protocol/ui-beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit f916fbe96f7a41c18e756270a1129ca9b467a2c9
Merge: c8b0e04 e736102
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Apr 22 16:16:20 2018 +0800
Merge branch 'master' into protocol/ui-beta
.../apm/collector/boot/CollectorBootStartUp.java | 3 +-
.../client/elasticsearch/ElasticSearchClient.java | 75 +++++++---------------
.../ElasticSearchClientException.java | 9 +--
.../apm/collector/core/module/BootstrapFlow.java | 3 +-
.../apm/collector/core/module/ModuleManager.java | 2 +-
.../apm/collector/core/module/ModuleProvider.java | 2 +-
.../core/module/ModuleStartException.java} | 12 ++--
.../collector/core/module/ModuleManagerTest.java | 3 +-
.../collector/storage/StorageInstallException.java | 1 -
.../apm/collector/storage/StorageInstaller.java | 27 ++++++--
.../storage/es/StorageModuleEsProvider.java | 14 ++--
.../base/define/ElasticSearchStorageInstaller.java | 48 ++++++++++----
.../storage/h2/StorageModuleH2Provider.java | 2 +-
.../storage/h2/base/define/H2StorageInstaller.java | 14 ++--
14 files changed, 109 insertions(+), 106 deletions(-)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.