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

Merge master #2

Merged
merged 4 commits into from
Apr 21, 2020
Merged

Merge master #2

merged 4 commits into from
Apr 21, 2020

Conversation

jyotimahapatra
Copy link

@jyotimahapatra jyotimahapatra commented Apr 21, 2020

@jessicayuen Since the xdsimpl interface changed quite a bit, im trying to help with the merge of master into your orchestrator branch.

Lisa Lu and others added 3 commits April 16, 2020 11:58
Fixes envoyproxy#58 

The expiration time should only be delayed in SetResponse, since the intent of the TTL was to avoid stale responses in the cache. Adding/removing watches should not affect the expiration time of a key. This change removes that extension from AddWatch, and envoyproxy#59 already omits the expiry time extension.

Signed-off-by: Lisa Lu <lisalu@lyft.com>
Signed-off-by: Jyoti Mahapatra <jmahapatra@lyft.com>
Signed-off-by: Jyoti Mahapatra <jmahapatra@lyft.com>
Copy link
Owner

@jessicayuen jessicayuen left a comment

Choose a reason for hiding this comment

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

Thanks Jyoti!

internal/app/orchestrator/orchestrator.go Show resolved Hide resolved
Signed-off-by: Jyoti Mahapatra <jmahapatra@lyft.com>
@jessicayuen jessicayuen merged commit 86be5dc into jessicayuen:orchestrator Apr 21, 2020
@jyotimahapatra jyotimahapatra deleted the orch branch April 21, 2020 20:49
jessicayuen pushed a commit that referenced this pull request Apr 24, 2020
* Don't extend TTL for AddWatch (envoyproxy#60)

Signed-off-by: Jyoti Mahapatra <jmahapatra@lyft.com>
jessicayuen pushed a commit that referenced this pull request Apr 24, 2020
* Don't extend TTL for AddWatch (envoyproxy#60)

Signed-off-by: Jyoti Mahapatra <jmahapatra@lyft.com>
Signed-off-by: Jess Yuen <jyuen@lyft.com>
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.

2 participants