skywalking-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kezhenx...@apache.org
Subject [skywalking] branch feature/elasticsearch-client updated (2cf3c1a -> 85f13c8)
Date Sat, 04 Sep 2021 07:27:56 GMT
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch feature/elasticsearch-client
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 2cf3c1a  Fix mockito and powermock conflict
     add 85f13c8  Fix mockito and powermock conflict

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2cf3c1a)
            \
             N -- N -- N   refs/heads/feature/elasticsearch-client (85f13c8)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../plugin/etcd/ITClusterEtcdPluginTest.java       |  4 +-
 .../cluster-nacos-plugin/pom.xml                   | 75 ++--------------------
 ...ITClusterModuleNacosProviderFunctionalTest.java | 46 ++++++++-----
 .../plugin/elasticsearch/base/TimeSeriesUtils.java |  2 +-
 4 files changed, 38 insertions(+), 89 deletions(-)

Mime
View raw message