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

NXP-28802: Make fixed part of document history pp configurable (10.10) #3902

Merged
merged 2 commits into from
Apr 10, 2020

Conversation

michaelva
Copy link
Contributor

No description provided.

@nuxeojenkins
Copy link
Collaborator

View issue in JIRA

@troger
Copy link
Member

troger commented Apr 9, 2020

pageProvider.setSearchDocumentModel(searchDoc);
assertEquals(1, pageProvider.getCurrentPage().size());

//test with proxy to check that the doc uuid is correctly set in the fixed part
Copy link
Member

Choose a reason for hiding this comment

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

This comment and the one above has the correct space after // on master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for catching it.

@efge efge changed the title NXP-28802: Make fixed part of document history pp configurable NXP-28802: Make fixed part of document history pp configurable (10.10) Apr 9, 2020
Copy link
Member

@kevinleturc kevinleturc left a comment

Choose a reason for hiding this comment

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

Could commits be fixup?

@michaelva
Copy link
Contributor Author

@kevinleturc do you mean squashed?

@kevinleturc
Copy link
Member

This is the same thing, squash keeps the commit message whereas fixup doesn't.

You can use one or the other. Thanks

Copy link
Member

@efge efge left a comment

Choose a reason for hiding this comment

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

Also in the future please make sure you have 10.10 somewhere in the branch name.

@michaelva michaelva merged commit aa7bfdb into 10.10 Apr 10, 2020
@michaelva michaelva deleted the backport-NXP-28802-configurable-document-history branch April 10, 2020 10:10
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.

5 participants