geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zho...@apache.org
Subject [geode] branch feature/GEODE-3967 updated (15c3600 -> 291b1c1)
Date Thu, 25 Jan 2018 08:14:50 GMT
This is an automated email from the ASF dual-hosted git repository.

zhouxj pushed a change to branch feature/GEODE-3967
in repository https://gitbox.apache.org/repos/asf/geode.git.


    omit 15c3600  GEODE-3967: when ConcurrentCacheModificationException happened. GatewaySenderEventImpl
should save the status and notify gatewaysender anyway. SerialGatewaySender will handle it.
In AbstractUpdateOperation's doPutOrCreate's 3 tries of basicUpdate, the 3rd one should allow
both create and update.             make event with CME to be ignored by dispatcher
     add 4d46ba5  GEODE-4079 Identify hash indexes as deprecated in docs for gfsh create index
command
     add 1f06a68  GEODE-4365: do not call GemFireCacheImpl.getExisting (#1331)
     add 1c95035  GEODE-4355: use Awaitility to fix ControlFileWatchdogIntegrationTest flakiness
(#1329)
     add ee9b51b  GEODE-4358: Added check for null updater
     add f4b7f6d  GEODE-4374: Mark ShutdownCommandOverHttpDUnitTest as Flaky
     new 291b1c1  GEODE-3967: when ConcurrentCacheModificationException happened. GatewaySenderEventImpl
should save the status and notify gatewaysender anyway. SerialGatewaySender will handle it.
In AbstractUpdateOperation's doPutOrCreate's 3 tries of basicUpdate, the 3rd one should allow
both create and update.             make event with CME to be ignored by dispatcher

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   (15c3600)
            \
             N -- N -- N   refs/heads/feature/GEODE-3967 (291b1c1)

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.

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:
 .../cache/client/internal/QueueConnectionImpl.java |  4 +-
 .../cache/client/internal/QueueManagerImpl.java    |  6 ++-
 .../geode/internal/cache/TXCommitMessage.java      |  2 +-
 .../wan/AbstractGatewaySenderEventProcessor.java   | 59 +++++++++++-----------
 .../internal/cache/wan/GatewaySenderEventImpl.java |  3 +-
 ...Test.java => QueueConnectionImplJUnitTest.java} | 33 +++++++-----
 .../ControlFileWatchdogIntegrationTest.java        | 15 +++---
 .../gfsh/command-pages/create.html.md.erb          |  2 +-
 .../commands/ShutdownCommandOverHttpDUnitTest.java |  3 +-
 9 files changed, 69 insertions(+), 58 deletions(-)
 copy geode-core/src/test/java/org/apache/geode/cache/client/internal/{AbstractOpTest.java
=> QueueConnectionImplJUnitTest.java} (50%)

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

Mime
View raw message