From 0a5bac7541af16b2a158d82c0087c43951a93302 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Sep 2013 09:04:34 -0700
Subject: Revert "ceph: parse CEPH_ARGS environment variable"

This reverts commit 67a95b9880c9bc6e858150352318d68d64ed74ad.

We now put CEPH_ARGS in the actual args we parse in python, which are passed
to rados piecemeal later.  This lets you put things like --id ... in there
that need to be parsed before librados is initialized.
---
 src/ceph.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ceph.in b/src/ceph.in
index 07b8dc12fd2..e4d4cf10344 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -559,7 +559,6 @@ def main():
     cluster_handle = rados.Rados(name=name, clustername=clustername,
                                  conf_defaults=conf_defaults, conffile=conffile)
 
-    cluster_handle.conf_parse_env()
     retargs = cluster_handle.conf_parse_argv(childargs)
     #tmp = childargs
     childargs = retargs
-- 
cgit v1.2.1