Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Merge lyft flyte #155

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open

Merge lyft flyte #155

wants to merge 48 commits into from

Conversation

anandswaminathan
Copy link
Contributor

wild-endeavor and others added 30 commits February 3, 2020 13:08
@wild-endeavor
OAuth workaround for L5 (#60)
5014bba
@wild-endeavor
Use host matching for L5 OAuth workaround (#62)
b7ea1f8
@katrogan
Merge branch 'master' into Lyft-Flyte
f23975c
@wild-endeavor
need to special case the callback logic too (#64)
787edbc
@katrogan
Merge branch 'master' into Lyft-Flyte
82671f3
Merge remote-tracking branch 'origin/master' into Lyft-Flyte
ccd6f53
@katrogan
Merge branch 'master' into Lyft-Flyte
03565cf
@katrogan
Merge branch 'Lyft-Flyte' of github.com:lyft/flyteadmin into Lyft-Flyte
1e68322
@katrogan
Merge branch 'master' into Lyft-Flyte
9cd0c3c
@anandswaminathan
Merge branch 'latest_master' into latest_merge
6b4fd0a
@anandswaminathan
Merge branch 'latest_master' into latest_merge
138752e
Merge remote-tracking branch 'origin/master' into Lyft-Flyte
cb5ede1
@katrogan
Merge branch 'master' into Lyft-Flyte
e4560ed
@katrogan
Merge branch 'Lyft-Flyte' of github.com:lyft/flyteadmin into Lyft-Flyte
bd5c585
@katrogan
Merge branch 'master' into Lyft-Flyte
31fd6a5
@katrogan
Merge branch 'master' into Lyft-Flyte
8331766
@katrogan
Merge branch 'master' into Lyft-Flyte
1090c6b
@katrogan
Merge branch 'master' into Lyft-Flyte
d611bac
@katrogan
Merge branch 'master' into Lyft-Flyte
9e038ac
@anandswaminathan
Merge branch 'newb' into latest_merge
a538b2e
@katrogan
Merge branch 'master' into Lyft-Flyte
ece6781
@katrogan
Merge branch 'master' into Lyft-Flyte
85386a1
@katrogan
Merge branch 'master' into Lyft-Flyte
539d401
@katrogan
Merge branch 'master' into Lyft-Flyte
424af21
Merge branch 'master' into Lyft-Flyte
6a72a7a
@wild-endeavor
[do not use] Raise gRPC limit to 16 MB (#100)
d65d53b
@katrogan
Merge branch 'master' into Lyft-Flyte
6cbedc2
@katrogan
Removing Gopkg
9cc1057
@EngHabu
Merge branch 'master' of github.com:lyft/flyteadmin into lyft-flyte
867f69a
Merge remote-tracking branch 'origin/master' into Lyft-Flyte
33f5cae
katrogan and others added 17 commits June 29, 2020 21:14
@katrogan
Merge branch 'master' into Lyft-Flyte
0705030
Merge branch 'master' into Lyft-Flyte
db34f3c
Merge remote-tracking branch 'origin/master' into Lyft-Flyte
4186ed5
Merge branch 'Lyft-Flyte' of github.com:lyft/flyteadmin into Lyft-Flyte
e3b4758
@EngHabu
Merge branch 'master' of github.com:lyft/flyteadmin into Lyft-Flyte
70d19fe
@katrogan
Merge branch 'master' into Lyft-Flyte
e2c0f51
@anandswaminathan
Merge branch 'master' into latest_merge
84a4337
@katrogan
Merge branch 'master' of github.com:lyft/flyteadmin into Lyft-Flyte
a0d8121
@katrogan
Merge branch 'Lyft-Flyte' of github.com:lyft/flyteadmin into Lyft-Flyte
23cb9d3
@katrogan
Merge branch 'master' into Lyft-Flyte
1742782
@schottra
Merge branch 'master' into Lyft-Flyte
9cd682d 
* master:
  Gcs remote data (#121)
  Do not depend on GOPATH to locate test data (#122)
  Add index to optimize for list task executions for node execution (#120)
  Grpc health checking (#118)
  Allow random cluster selection when no override (#117)
@schottra
Merge remote-tracking branch 'origin/master' into Lyft-Flyte
27cb574 
* origin/master:
  #patch Allow unscoped filtering on all NamedEntity(Metadata) fields (#124)
  Put testdata together with test cases (#123)
@katrogan
Merge branch 'master' into Lyft-Flyte
85296b2
@katrogan
Double header limit size
cd655bd
@katrogan
Merge in master
69fd84d
@katrogan
Merge branch 'master' into Lyft-Flyte
068b0ab
@anandswaminathan
Merge branch 'master' into latest_merge
d65105c
@anandswaminathan
Fixes for L5
0d1cc1d 
Signed-off-by: Anand Swaminathan <aswaminathan@lyft.com>
wild-endeavor
wild-endeavor approved these changes Mar 4, 2021
View reviewed changes
Copy link
Contributor

@wild-endeavor wild-endeavor left a comment

Choose a reason for hiding this comment

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

but this should go into the Lyft-Flyte branch, not master

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wild-endeavor wild-endeavor wild-endeavor approved these changes

@EngHabu EngHabu Awaiting requested review from EngHabu EngHabu is a code owner

@katrogan katrogan Awaiting requested review from katrogan katrogan is a code owner

@kumare3 kumare3 Awaiting requested review from kumare3 kumare3 is a code owner

At least 1 approving review is required to merge this pull request.

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

Successfully merging this pull request may close these issues.
5 participants
@anandswaminathan @wild-endeavor @katrogan @EngHabu @schottra