You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by rh...@apache.org on 2020/03/20 04:25:23 UTC

[geode] branch feature/GEODE-7109 updated (482148e -> 51f45b8)

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

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


 discard 482148e  Trigger precheckin
 discard 0e4833d  fix a warning.
 discard 088ad6f  Merge branch 'develop' into feature/GEODE-7109
    omit 5773592  Merge branch 'develop' into feature/GEODE-7109
    omit c532e9e  * avoid catalin code being loaded in servers other than tomcat, as the test war file   are shared. * increase server container max memory to avoid unexpected eviction in gemfire   client cache
    omit b8afc5f  Trigger precheckin
    omit 009a555  Trigger precheckin
    omit 8e26d0f  Trigger precheckin
    omit 04bc76c  GEODE-7109: add test case that multiple sessions can be maintained.
     add 0dfff8c  GEODE-7604: Fix Test Flakiness (#4825)
     add a627cb7  GEODE-7869: Revert content type changes.
     add 9cddaec  GEODE-7893: Fix Analyzer dependency in geode-lucene (#4829)
     add 3cdb7c3  GEODE-7109: add test case that multiple sessions can be maintained.
     add f73ddde  * avoid catalin code being loaded in servers other than tomcat, as the test war file   are shared. * increase server container max memory to avoid unexpected eviction in gemfire   client cache
     add 8e2de0b  fix a warning.
     add 51f45b8  Fix merge/rebase conflict, adding catalina from tomcat-6

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   (482148e)
            \
             N -- N -- N   refs/heads/feature/GEODE-7109 (51f45b8)

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:
 extensions/session-testing-war/build.gradle        | 22 +++++++++---------
 .../rest/internal/web/RestRegionAPIDUnitTest.java  |  5 ++++-
 .../internal/web/RestSecurityIntegrationTest.java  | 16 +++++++------
 .../web/RestSecurityPostProcessorTest.java         | 15 ++++++++-----
 ...igurationServiceConstraintsDistributedTest.java | 26 ++++++++++++----------
 geode-lucene/build.gradle                          |  5 +++--
 geode-lucene/src/test/resources/expected-pom.xml   | 12 +++++-----
 .../web/controllers/RestAccessControllerTest.java  |  8 +++++--
 .../web/controllers/AbstractBaseController.java    |  6 +++++
 .../web/controllers/CommonCrudController.java      |  9 ++++----
 .../web/controllers/FunctionAccessController.java  |  5 ++---
 .../web/controllers/PdxBasedCrudController.java    | 14 ++++++------
 .../web/controllers/QueryAccessController.java     | 12 +++++-----
 .../rest/security/RestSecurityConfiguration.java   |  6 ++++-
 14 files changed, 92 insertions(+), 69 deletions(-)