Re: Sentry Release Schedule for FGP and ABAC

2018-05-01 Thread Anthony Young-Garner
Yes, force pushes on the feature branch would be required. We can post on the JIRA that there will be ongoing rebases on the feature branch so anyone wanting to commit code is aware. And then we can post on the mailing list when rebases are happening -- either on a regular schedule (e.g. every

Re: Sentry Release Schedule for FGP and ABAC

2018-05-01 Thread Alexander Kolbasov
One aspect we should consider is git history - working on feature branch tends to produce a complicated git tree with many merges instead of the linear tree that we get by working on master directly. On Tue, May 1, 2018 at 8:57 AM, Na Li wrote: > Steve, > > I am OK for

Re: Sentry Release Schedule for FGP and ABAC

2018-05-01 Thread Na Li
Steve, I am OK for ABAC to be on feature branch if you make sure 1) pull latest master to your feature branch 2) Let us review your changes with all unit tests pass. Thanks, Lina On Tue, May 1, 2018 at 10:48 AM, Stephen Moist wrote: > I’m fine with putting everything into

Re: Sentry Release Schedule for FGP and ABAC

2018-05-01 Thread Stephen Moist
I’m fine with putting everything into a feature branch for now. Right now, the initial ABAC patch is a working solution. It’s not the final solution that we plan to deliver. We could keep iterating on SENTRY-2201 and adding more code to a

Re: Sentry Release Schedule for FGP and ABAC

2018-04-30 Thread Alexander Kolbasov
Stephen, a lot depends on your plans in terms of breaking functionality. For example, one of the reasons Sentry HA was developed on a feature branch was because it was a serious change in architecture and in broke functionality for a while. I think some of the merge problems which Sergio referred

Re: Sentry Release Schedule for FGP and ABAC

2018-04-26 Thread Sergio Pena
Hey Stephen, I'm not totally against having a feature branch, but we had a bad experience with the Sentry HA re-design where all the work was done in a feature branch. After doing so many fixes and improvements in that sentry-ha branch, it was difficult to merge it into master, so we decided to

Re: Sentry Release Schedule for FGP and ABAC

2018-04-26 Thread Na Li
Stephen, I think it is OK for two features to be developed in parallel at master as long as the new updates do not break existing features. If ABAC feature is not complete when we release sentry 2.1, can you turn off ABAC in master branch, so it does not cause the release with incomplete

Sentry Release Schedule for FGP and ABAC

2018-04-26 Thread Stephen Moist
Hey all, what does the current roadmap and release schedule look like for FGP and ABAC? I’ve been told that FGP is going out in the next release, ABAC is more slated for the summer. How do we want to handle simultaneous development of these features? For ABAC, our dev process is more agile.