bschuchardt opened a new pull request #5428:

   …ut in different directories
   I modified the upper levels of the merge process to hold a new object
   containing the file's display name and its inputStream.  The
   logFiles Map now holds the full path of a file and one of these new
   objects.  The new test then uses a dirCount of zero to test that
   two files with the same name but different parent directories are
   properly stored in the Map for processing.
   Thank you for submitting a contribution to Apache Geode.
   In order to streamline the review of the contribution we ask you
   to ensure the following steps have been taken:
   ### For all changes:
   - [ ] Is there a JIRA ticket associated with this PR? Is it referenced in 
the commit message?
   - [ ] Has your PR been rebased against the latest commit within the target 
branch (typically `develop`)?
   - [ ] Is your initial contribution a single, squashed commit?
   - [ ] Does `gradlew build` run cleanly?
   - [ ] Have you written or updated unit tests to verify your changes?
   - [ ] If adding new dependencies to the code, are these dependencies 
licensed in a way that is compatible for inclusion under [ASF 
   ### Note:
   Please ensure that once the PR is submitted, check Concourse for build 
issues and
   submit an update to your PR as soon as possible. If you need help, please 
send an
   email to

This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:

Reply via email to