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

Carry v0.4.3 master bump #1072

Merged
merged 5 commits into from
Jan 12, 2017
Merged

Conversation

riyazdf
Copy link
Contributor

@riyazdf riyazdf commented Jan 5, 2017

Carries patches from v0.4.3 back to master - the delegation key import panic fix and netgo flag for server flag panic.

There was some messiness because of repeat lint commits that already made it to master, so I removed those in this PR.

-ldflags "-w ${CTIMEVAR} ${LDFLAGS}" \
./cmd/notary;
set +x;
done
Copy link
Contributor

Choose a reason for hiding this comment

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

Non-blocking nitpicky-ness - could we add a newline afterward?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!

Copy link
Contributor

@cyli cyli left a comment

Choose a reason for hiding this comment

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

LGTM!

@riyazdf riyazdf force-pushed the v0.4.3-master-bump branch 2 times, most recently from c549cd6 to a30769d Compare January 5, 2017 23:45
Copy link
Contributor

@endophage endophage left a comment

Choose a reason for hiding this comment

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

LGTM

@endophage
Copy link
Contributor

@riyazdf can you rebase then assuming tests pass we're good to merge.

… slash

Also updates a test to fix the expected vs actual values.

Signed-off-by: Riyaz Faizullabhoy <[email protected]>
@riyazdf riyazdf force-pushed the v0.4.3-master-bump branch from a30769d to 4cf0688 Compare January 12, 2017 18:02
@riyazdf
Copy link
Contributor Author

riyazdf commented Jan 12, 2017

green after rebase! Merging.

@riyazdf riyazdf merged commit 662571b into notaryproject:master Jan 12, 2017
@riyazdf riyazdf deleted the v0.4.3-master-bump branch January 12, 2017 18:16
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.

3 participants