Ethan, the feature branch merge is not squashed. It's because when I finished the merge branch, there was a new commit HDDS-15607, which prevented me from pushing the local master to github, to avoid the whole process again(it cost totally 4hours including the CI). so I checked out the master, and cherry-picked the merge commit, which caused the history to be lost.
Let me redo the feature branch merge. For the doc, is https://github.com/apache/ozone-site not the right place to have docs now? Could you point to the right place? Sammi On Tue, 21 Jul 2026 at 22:02, Ethan Rose <[email protected]> wrote: > Sammi, those instructions also included steps to properly incorporate the > change into master. The feature was squash merged and all Jira history for > the feature was lost. Please revert this and execute the merge as > documented. > > Also, the user docs were added to the old website which is no longer > published. They need to be put in the new website for users to actually see > them. I was going to leave this feedback when the checklist was raised as a > PR. I was not expecting the branch to be merged without following any of > the previous instructions. > > Ethan > > On Tue, Jul 21, 2026 at 12:31 AM Sammi Chen <[email protected]> wrote: > > > Thanks everyone for voting! > > > > We got 3 binding +1(Xi, Yiyang, Sumit) and 2 non-binding +1(Preyesh, > > Gargi). > > The vote is passed. > > I will start to merge the HDDS-8342 branch into the master next. > > > > @Sumit, there is no consolidate PR for all code, but the code is mainly > > under ozone-manager > > module(KeyLifecycleService, org.apache.hadoop.ozone.om > .request.lifecycle, > > org.apache.hadoop.ozone.om.response.lifecycle), ozone-s3gateway > > module(S3LifecycleConfiguration, put/get/delete), and ozone-cli-admin > > module(LifecycleSubCommand). > > > > @Ethan, sure, will provide the website PR later. > > > > On Tue, 21 Jul 2026 at 04:54, Ethan Rose <[email protected]> wrote: > > > > > Thanks for working on this Sammi. We have a (very) new process for > > feature > > > branch merges documented on the website > > > < > > > > > > https://ozone.apache.org/docs/next/developer-guide/project/git/feature-branches/overview/#merge-process > > > >. > > > Can you follow this process and share the website PR with the branch > > merge > > > checklist? Ideally we will not add new content to Confluence. > > > > > > Thanks, > > > Ethan > > > > > > On Mon, Jul 20, 2026 at 12:46 AM Priyesh Karatha < > > > [email protected]> > > > wrote: > > > > > > > +1 for merge > > > > > > > > Thanks > > > > Priyesh > > > > > > > > On 2026/07/14 08:34:27 Sammi Chen wrote: > > > > > Hi Ozone developers, > > > > > > > > > > I would like to propose merging HDDS-8342 (S3 Lifecycle > > Configurations > > > - > > > > > Object Expiration) feature branch into master. > > > > > > > > > > This feature is to support S3 lifecycle configuration with object > > > > > expiration action, which helps Ozone administrators to > automatically > > > > expire > > > > > and remove files/objects that are no longer needed, to free > storage > > > > space. > > > > > More details about the feature are present in design documents > > attached > > > > in > > > > > the below mentioned Ozone confluence page link. > > > > > > > > > > Checklist for feature branch merge: > > > > > > > > > > > > > > > https://cwiki.apache.org/confluence/spaces/OZONE/pages/421954521/S3+Lifecycle+Configuration+-+Object+Expiration+-+HDDS-8342 > > > > > > > > > > > > > > > Feature Jira Link: > > > > > https://issues.apache.org/jira/browse/HDDS-8342 > > > > > > > > > > This vote will be open for 7 days. > > > > > > > > > > Thanks, > > > > > Sammi Chen > > > > > > > > > > > > > --------------------------------------------------------------------- > > > > To unsubscribe, e-mail: [email protected] > > > > For additional commands, e-mail: [email protected] > > > > > > > > > > > > > >
