From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Aug 2019 20:49:29 +0000 (-0500)
Subject: Merge PR #29511 into master
X-Git-Tag: v15.1.0~1929
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0fca4eaf6546b4e807b38c5c7a6c097750e486c;p=ceph.git

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

a0fca4eaf6546b4e807b38c5c7a6c097750e486c