]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commita0fca4eaf6546b4e807b38c5c7a6c097750e486c
treebb71d70ad2821838cb3a566017e5f99541ba78a4
parent01fcf0e401478fd1e13703a4c450f12e29b8e1f5
parent25f28e610fe674f24eaa0a66c9ccc91b03fdcc92
Merge PR #29511 into master

* 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>