[geode] branch feature/GEODE-6058 updated (9c88962 -> 1b7636f)

[zh...@apache.org]

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

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


 discard 9c88962  GEODE-6058: recordVersion should allow update higher local version if for non-persistent region
     add 4cc2d46  GEODE-6014: Removed unnecessary null checks. (#2813)
     add 1b7636f  GEODE-6058: recordVersion should allow update higher local version if for non-persistent region

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   (9c88962)
            \
             N -- N -- N   refs/heads/feature/GEODE-6058 (1b7636f)

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:
 .../session/catalina/DeltaSessionManager.java      | 22 ++++++++------------
 .../internal/DistributedSystemConfigImpl.java      |  2 +-
 .../geode/cache/client/internal/PoolImpl.java      |  4 ++--
 .../query/internal/CompiledGroupBySelect.java      |  2 +-
 .../cache/query/internal/index/HashIndex.java      |  2 +-
 .../internal/ClusterDistributionManager.java       |  3 ---
 .../distributed/internal/tcpserver/TcpClient.java  | 10 ++++-----
 .../java/org/apache/geode/internal/OSProcess.java  |  1 -
 .../admin/remote/RemoteGfManagerAgent.java         |  2 +-
 .../geode/internal/cache/AbstractRegion.java       |  6 +++---
 .../geode/internal/cache/AbstractRegionMap.java    |  2 +-
 .../apache/geode/internal/cache/FilterProfile.java |  8 ++------
 .../geode/internal/cache/PartitionedRegion.java    | 15 ++++----------
 .../internal/cache/PartitionedRegionDataStore.java |  2 +-
 .../geode/internal/cache/ServerPingMessage.java    |  2 +-
 .../geode/internal/cache/StateFlushOperation.java  |  2 +-
 .../geode/internal/cache/entries/DiskEntry.java    |  8 ++++----
 .../internal/cache/locks/TXLockServiceImpl.java    |  7 ++-----
 .../cache/tier/sockets/CacheClientNotifier.java    |  8 +-------
 .../internal/cache/xmlcache/CacheXmlGenerator.java |  4 ++--
 .../concurrent/CompactConcurrentHashSet2.java      | 14 ++++++-------
 .../geode/internal/shared/NativeCallsJNAImpl.java  |  5 +++--
 .../management/internal/ManagementFunction.java    | 10 +--------
 .../internal/beans/LocatorMBeanBridge.java         | 12 ++++-------
 .../cli/commands/CompactDiskStoreCommand.java      |  2 +-
 .../GetMemberConfigInformationFunction.java        | 24 ++++++++++------------
 .../management/internal/cli/json/TypedJson.java    | 16 +++++++--------
 .../internal/cli/util/ReadWriteFile.java           | 10 +++------
 .../cache/versions/RegionVersionVectorTest.java    |  2 +-
 .../cache/query/internal/cq/CqServiceImpl.java     |  3 +--
 .../cache/tier/sockets/command/CloseCQ.java        | 10 ++++-----
 .../cli/functions/LuceneSearchIndexFunction.java   |  4 +---
 .../internal/distributed/LuceneQueryFunction.java  |  2 +-
 33 files changed, 85 insertions(+), 141 deletions(-)