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.

Sign up for GitHub

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

Jump to bottom

Merge v1.2.3 master #1538

Merged
merged 7 commits into from
May 3, 2017
Merged

Merge v1.2.3 master #1538

merged 7 commits into from
May 3, 2017

Conversation

emilevauge
Copy link
Member

@emilevauge emilevauge commented May 3, 2017 •
edited
Loading

Description

This PR reports tag v1.2.3 into master.
Cherry picked:

40afd64
b3e6c7f
fa4d2d3
0ecfbb8
e21feae
37b44cc

@emilevauge emilevauge added this to the 1.3 milestone May 3, 2017
@emilevauge emilevauge added the WIP label May 3, 2017
@timoreimann
Copy link
Contributor

@emilevauge AFAICS, the vendored files should not be touched.

Please double-check they do not contain changes which should have gone into the non-vendored copy. git might have been confused (-X find-renames is your friend).

@emilevauge
Copy link
Member Author

@timoreimann Indeed, that's why there is still a WIP label :)
FYI, git cherry-pick -Xrename-threshold=10% was not enough, I had to remove temporarily integration/vendor, cherry pick all commits and finally rebase interactively to remove the temp commit.
We need to merge #1541 before this one, to avoid merge conflicts in server.go.

@timoreimann
Copy link
Contributor

Reading the git diff documentation again, it looks like you need to actually increase the threshold in order to force git to be more strict.

Good to know for the next time. :-)

@emilevauge
Copy link
Member Author

I tried with 10, 30, 50 and 80 :)

@timoreimann
Copy link
Contributor

Aww, damn!

ldez
ldez suggested changes May 3, 2017
View reviewed changes
Copy link
Contributor

@ldez ldez left a comment

Choose a reason for hiding this comment

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

@emilevauge you have my commit in your branch...

@emilevauge
Copy link
Member Author

emilevauge commented May 3, 2017 •
edited
Loading

@ldez I know I know, I'm waiting for #1541 to be merged before rebasing :)

@emilevauge emilevauge removed the WIP label May 3, 2017
emilevauge and others added 6 commits May 3, 2017 22:53
@emilevauge
Fix postLoadConfig
ec245d6 
Signed-off-by: Emile Vauge <emile@vauge.com>
@emilevauge
Fix Docker filter empty rule
bf3f6e2 
Signed-off-by: Emile Vauge <emile@vauge.com>
@argeiger @emilevauge
Fix redirect empty backend
138fea1 
Issue-#679
@emilevauge
Prepare release v1.2.2
ca9e36e 
Signed-off-by: Emile Vauge <emile@vauge.com>
@emilevauge
Fix too many redirect
e7a73d3 
Signed-off-by: Emile Vauge <emile@vauge.com>
@emilevauge
Prepare release v1.2.3
8ac281f 
Signed-off-by: Emile Vauge <emile@vauge.com>
@ldez ldez merged commit 5535318 into master May 3, 2017
@ldez ldez deleted the merge-v1.2.3-master branch May 3, 2017 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ldez ldez ldez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.3
Development

Successfully merging this pull request may close these issues.
4 participants
@emilevauge @timoreimann @ldez @argeiger