]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01fcf0e 25f28e6)
Merge PR #29511 into master
authorSage Weil <sage@redhat.com>
Thu, 8 Aug 2019 20:49:29 +0000 (15:49 -0500)
committerSage Weil <sage@redhat.com>
Thu, 8 Aug 2019 20:49:29 +0000 (15:49 -0500)
* refs/pull/29511/head:
common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars
common/config: let diff show non-build defaults
common/config: do no include multiple 'default' values

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.