Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use LDAP paged search in GetUserSPNs.py #27

Merged

Conversation

ShutdownRepo
Copy link
Member

Original PR: fortra#1487

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on a prod env. OK
See fortra#1485 for more info

@ShutdownRepo
Copy link
Member Author

@SAERXCIT @ThePirateWhoSmellsOfSunflowers it seems original PR (fortra#1487) is closed and new one is fortra#1498. I think we should close this PR and open a new one reflecting the changes of 1498 right?

@ThePirateWhoSmellsOfSunflowers

No, it's because fixing a conflict between this repo and forta's one breaks PR on forta side. Another example is this PR fortra#1262, I think forta will never merge it because now, Podalirius branch contains 250+ commits instead of 1 (if I remember correctly).

As Porgs branch is 260+ commits ahead of forta, I think it is no longer possible to have a clean PR system between forta/porgs.

🌻

@ShutdownRepo
Copy link
Member Author

Ok, understood, let's merge here
For PRs with lots of commits, fortra could always choose to squash & merge in order to keep commits history tight.
But yeah, I agreed, the more fortra waits on merging things, and the more ThePorgs progresses, the two forks will have troubles having a clean PR sync

@ShutdownRepo ShutdownRepo merged commit 4375a99 into ThePorgs:master Mar 18, 2023
ShutdownRepo added a commit that referenced this pull request Mar 18, 2023
ShutdownRepo added a commit that referenced this pull request Jul 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants