Merge remote branch 'origin/master' into wip-pool-sharing

Conflicts:
	src/osd/OSD.cc
	src/rgw/rgw_rados.cc

diff --cc src/Makefile.am
Simple merge

diff --cc src/librados.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
index 1736536002c265ae2ca81b30a5dc08bbee50a93a,c66889a220b7f62521a4684f0d0a4b71aa15de31..241d1eac3f9e542ea06a3e1490c18cdfe769b41f
--- 1/src/rgw/rgw_rados.cc
--- 2/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -289,7 -315,9 +293,10 @@@ int RGWRados::list_objects(string& id, 
   * if auid is set, it sets the auid of the underlying rados io_ctx
   * returns 0 on success, -ERR# otherwise.
   */
- int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, map<std::string, bufferlist>& attrs, bool create_pool, bool assign_marker, bool exclusive, uint64_t auid)
+ int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, 
+                           map<std::string, bufferlist>& attrs, 
 -                          bool create_pool, bool exclusive, uint64_t auid)
++                          bool create_pool, bool assign_marker,
++                          bool exclusive, uint64_t auid)
  {
    librados::ObjectWriteOperation op;
    op.create(exclusive);