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

Various #62

Merged
merged 3 commits into from
Jan 18, 2018
Merged

Various #62

merged 3 commits into from
Jan 18, 2018

Conversation

ibuildthecloud
Copy link
Contributor

@ibuildthecloud ibuildthecloud commented Jan 18, 2018

Change merge logic
Fix subscription dropping after 30 seconds
Switch args in namespace methods

@ibuildthecloud ibuildthecloud changed the title Various Change merge logic Fix subscription dropping after 30 seconds Switch args in namespace methods Various Jan 18, 2018
@ibuildthecloud ibuildthecloud merged commit 76d8256 into rancher:master Jan 18, 2018
jordanjean pushed a commit to jordanjean/norman that referenced this pull request Jan 7, 2020
Added cluster and project scope support on rancher2_catalog resource and datasource
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.

1 participant