Skip to content

[1.14] Change plugin_dir to plugin_dirs#2422

Merged
openshift-merge-robot merged 1 commit intocri-o:release-1.14from
haircommander:plugin-dirs
May 30, 2019
Merged

[1.14] Change plugin_dir to plugin_dirs#2422
openshift-merge-robot merged 1 commit intocri-o:release-1.14from
haircommander:plugin-dirs

Conversation

@haircommander
Copy link
Member

To maintain backwards compatibility, change plugin_dir to plugin_dirs in crio configs.
Mark plugin_dir depreciated, and send warning as such.

Signed-off-by: Peter Hunt pehunt@redhat.com

@openshift-ci-robot openshift-ci-robot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label May 29, 2019
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 29, 2019
@haircommander haircommander changed the title Change plugin_dir to plugin_dirs [1.14] Change plugin_dir to plugin_dirs May 29, 2019
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Changes LGTM but maybe we can add a test?

@haircommander haircommander force-pushed the plugin-dirs branch 2 times, most recently from caceeb7 to 133cbbb Compare May 29, 2019 17:43
@umohnani8
Copy link
Member

one nit, otherwise LGTM

To maintain backwards compatibility, change plugin_dir to plugin_dirs in crio configs.
Mark plugin_dir depreciated, and send warning as such.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander
Copy link
Member Author

/retest

@codecov-io
Copy link

Codecov Report

Merging #2422 into release-1.14 will increase coverage by 0.05%.
The diff coverage is 87.5%.

@@               Coverage Diff                @@
##           release-1.14    #2422      +/-   ##
================================================
+ Coverage         31.23%   31.29%   +0.05%     
================================================
  Files                76       76              
  Lines              6831     6836       +5     
================================================
+ Hits               2134     2139       +5     
  Misses             4569     4569              
  Partials            128      128

@haircommander
Copy link
Member Author

/retest

@mrunalp
Copy link
Member

mrunalp commented May 30, 2019

/approve

@mrunalp
Copy link
Member

mrunalp commented May 30, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. labels May 30, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 30, 2019
@openshift-merge-robot openshift-merge-robot merged commit b510f24 into cri-o:release-1.14 May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants