I would also like to merge in "GEODE-2989: Improve mechanism for scanning the classpath to find gfsh commands" and "GEODE-2966: Refactor LauncherLifecycleCommands” today to avoid further merge conflicts. If that’s too much for 1.2, perhaps we can cut a release branch rather than freezing checkins on develop.
> On May 30, 2017, at 10:50 AM, Kirk Lund <kl...@apache.org> wrote: > > Heads up that I have a fix for "GEODE-2632: Integrated Security performance > improvements" but I'd like to split it into two merges to develop this week. > > I'd like to merge the 1st commit to develop today. It touches many of the > client/server tier classes and has passed review, precheckin, full > regression, perf testing and a few conflict resolutions. > > 2nd commit has the actual changes to Security Service and changes to the > construction of the client Commands and would go in on Thursday or Friday > after I complete review, full regression and perf testing on it. This would > isolate the actual perf improvements to a smaller, more focused commit. > > If anyone really wants me to delay the 1st commit, please let me know. I'm > anxious to get it in to avoid handling more merge conflicts on it.