[geode] branch develop updated (f355664 -> b6f0ca1)

[bs...@apache.org]

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

bschuchardt pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.


    from f355664  GEODE-5524: Fix a race by waiting on correct condition. (#2258)
     add 73d90e0  GEODE-5520 Inconsistency created by delta interaction with concurrency control
     new b6f0ca1  Merge branch 'feature/GEODE-5520' into develop

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:
 .../apache/geode/cache/client/internal/PutOp.java  |  9 ++--
 .../cache/client/internal/PutOpJUnitTest.java      | 60 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 geode-core/src/test/java/org/apache/geode/cache/client/internal/PutOpJUnitTest.java

[geode] 01/01: Merge branch 'feature/GEODE-5520' into develop

[bs...@apache.org]

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

bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit b6f0ca1ff9c023708ca6e6620e567c30431b4a8a
Merge: f355664 73d90e0
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Aug 3 15:28:20 2018 -0700

    Merge branch 'feature/GEODE-5520' into develop
    
    This closes #2252

 .../apache/geode/cache/client/internal/PutOp.java  |  9 ++--
 .../cache/client/internal/PutOpJUnitTest.java      | 60 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)