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

Update origin-web-common to 0.0.31, origin-web-catalog to 0.0.19 #1658

Merged
merged 2 commits into from
Jun 7, 2017

Conversation

jeff-phillips-18
Copy link
Member

No description provided.

@spadgett
Copy link
Member

spadgett commented Jun 6, 2017

Do we need the changes from #1625 when we bump origin-web-common?

cc @rhamilto

@spadgett
Copy link
Member

spadgett commented Jun 6, 2017

I think we can remove applicationHasDeployment and applicationHasDeploymentConfig now as well.

@jeff-phillips-18
Copy link
Member Author

@spadgett PR #1599 will remove those filters.

@jeff-phillips-18
Copy link
Member Author

Updated dependencies in karam.conf.js to add new dependencies

@jeff-phillips-18
Copy link
Member Author

@spadgett should I include the changes from #1625 or close this and @rhamilto can bump in #1625?

@rhamilto
Copy link
Member

rhamilto commented Jun 7, 2017

@jeff-phillips-18, in talking with @spadgett, it sounds like its best for you to cherry-pick #1625 and do the update since this is already open.

@spadgett
Copy link
Member

spadgett commented Jun 7, 2017

it sounds like its best for you to cherry-pick #1625 and doing the update since this is already open.

Works for me.

I think it's a runtime error if a filter or service is defined twice? Would be good for everything to go in as one PR.

@spadgett
Copy link
Member

spadgett commented Jun 7, 2017

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to 2f29f12

@openshift-bot
Copy link

openshift-bot commented Jun 7, 2017

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1481/) (Base Commit: 7eed6c1)

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.

4 participants