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

fix: Revision history is not showing the timestamp of the revision (backport #1142) #1146

Merged
merged 2 commits into from
Aug 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2022

This is an automatic backport of pull request #1142 done by Mergify.
Cherry-pick of 5c15d0c has failed:

On branch mergify/bp/release-1.27.x/pr-1142
Your branch is up to date with 'origin/release-1.27.x'.

You are currently cherry-picking commit 5c15d0c9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…1142)

* fix: Revision history is not showing the timestamp of the revision

* fix: recovery timestamp data

* fix: replace updateTs with lastModified

* fix: unit tests

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 5c15d0c)

# Conflicts:
#	front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java
@link108 link108 merged commit 19566df into release-1.27.x Aug 2, 2022
@mergify mergify bot deleted the mergify/bp/release-1.27.x/pr-1142 branch August 2, 2022 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants