Re: Annual branch cleanup Aug 17

2021-08-17 Thread Jinmei Liao
Please leave the feature branch “expireAuthentication”, The RFC is in: https://cwiki.apache.org/confluence/display/GEODE/On+Demand+Geode+Authentication+Expiration+and+Re-authentication From: Owen Nichols Date: Sunday, August 1, 2021 at 1:01 AM To: dev@geode.apache.org Subject: Annual branch cle

Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Blake Bender
Hello everyone, Today I once again find myself between a rock and a hard place managing incoming PRs into the geode-native project. We merged a PR that passed checkin gates, then broke in the main CI pipeline. Additionally, our code formatter took an update yesterday, and now disagrees with s

Re: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Owen Nichols
For this situation in Geode repo, in addition to Squash, we also allow Rebase. This would allow you to put both commits in the same PR to pass checks, but still apply them to develop as separate commits. On 8/17/21, 2:20 PM, "Blake Bender" wrote: Hello everyone, Today I once again f

RE: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Blake Bender
Right, so I can keep my git history clean by: * doing a rebase-squash for PR A * (potentially) doing a rebase squash for PR B * combining A & B * resubmitting combined PR * crossing my fingers and hoping everything gets applied in the proper order to pass CI gates This work is all unnecessary, an

Re: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Jacob Barrett
It is actually worse than described right now. Even the combining of the PRs wouldn’t pass because they can’t affect the images themselves, which need patching to pass. The images are tainted by a previous merge too. So pinning back to an older image allows one of the fixes to pass but the other

Re: Annual branch cleanup Aug 17

2021-08-17 Thread Owen Nichols
Sounds good @Jinmei, and thanks for point out the associated RFC for this communal branch. It's past the announced deadline and I have run the following deletions to clean up the geode repo: git push origin --delete GEM-3288-network-interfaces git push origin --delete feature/GEODE-6316 git pus