From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sat, 12 Mar 2016 23:17:03 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/master' into wip-rgw-ldap
X-Git-Tag: v10.1.0~124^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5077d729cb04052254b1579de47ce2db0eeeabf8;p=ceph-ci.git

Merge remote-tracking branch 'origin/master' into wip-rgw-ldap
---

5077d729cb04052254b1579de47ce2db0eeeabf8
diff --cc src/rgw/rgw_lib.h
index 85a4c316429,be5add4564a..f418a6d1973
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@@ -26,9 -24,7 +26,8 @@@ namespace rgw 
      RGWFrontendConfig* fec;
      RGWLibFrontend* fe;
      OpsLogSocket* olog;
 +    rgw::LDAPHelper* ldh;
      RGWREST rest; // XXX needed for RGWProcessEnv
-     RGWProcessEnv env;
      RGWRados* store;
  
    public: