Skip to content

Regenerate protobuf for 3.5 (again)#2503

Merged
nishanttotla merged 1 commit intomoby:masterfrom
thaJeztah:regenerate-proto
Feb 7, 2018
Merged

Regenerate protobuf for 3.5 (again)#2503
nishanttotla merged 1 commit intomoby:masterfrom
thaJeztah:regenerate-proto

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Feb 5, 2018

Protobuf was updated to version 3.5, in commit 9b981e2 (#2448)
and regenerated in 93c3290 (#2451), however in 58e42ec (#2458)
those changes were reverted; possibly due to an older version of protobuf being used.

These are the changes after running make generate after installing protobuf 3.5.1

@thaJeztah
Regenerate protobuf for 3.5.1
21b7bef 
Protobuf was updated to version 3.5, in commit 9b981e2
and regenerated in 93c3290, however in 58e42ec
those changes were reverted; possibly due to an older version of protobuf being used.

These are the changes after running `make generate` after installing protobuf 3.5.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Feb 5, 2018
Merged
@stevvooe
Copy link
Copy Markdown
Contributor

stevvooe commented Feb 5, 2018

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 5, 2018

Getting two failures; are these flaky?

--- FAIL: TestServiceRemoveDeadTasks (0.26s)
	Error Trace:	task_reaper_test.go:544
	Error:		Not equal: 800 (expected)
			        != 640 (actual)
		

	Error Trace:	task_reaper_test.go:547
	Error:		Not equal: 800 (expected)
			        != 640 (actual)
		

time="2018-02-05T23:10:49Z" level=error msg="update failed" error="task 0u6xvpj228reqxorza7bvf2rh was already shut down when reached by updater" task.id=v755w2o2ztwzad9ovfeegydhc 
--- FAIL: TestUpdaterRollback (4.44s)
    --- FAIL: TestUpdaterRollback/pause/monitor_set/spec_version_set (1.61s)
	Error Trace:	testutils.go:26
			update_test.go:287
			update_test.go:20
	Error:		no task creation
    		

FAIL

@anshulpundir
Copy link
Copy Markdown
Contributor

anshulpundir commented Feb 5, 2018

Yea.

Kicked off a new run.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 6, 2018

Failed again, but looks like it didn't start properly

nishanttotla
nishanttotla approved these changes Feb 7, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

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

LGTM. Restarted tests once more, I'll merge once CI is green.

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 7, 2018 •
edited
Loading

Codecov Report

Merging #2503 into master will increase coverage by 0.24%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2503      +/-   ##
==========================================
+ Coverage   61.46%   61.71%   +0.24%     
==========================================
  Files          49      129      +80     
  Lines        6898    21325   +14427     
==========================================
+ Hits         4240    13161    +8921     
- Misses       2220     6750    +4530     
- Partials      438     1414     +976

@nishanttotla nishanttotla merged commit 43b1902 into moby:master Feb 7, 2018
@thaJeztah thaJeztah deleted the regenerate-proto branch February 7, 2018 20:47
@thaJeztah thaJeztah mentioned this pull request Jul 8, 2018
Closed
@thaJeztah thaJeztah mentioned this pull request Oct 26, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@nishanttotla nishanttotla nishanttotla approved these changes

@anshulpundir anshulpundir anshulpundir approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @stevvooe @anshulpundir @nishanttotla