From: Orit Wasserman <owasserm@redhat.com>
Date: Fri, 23 Sep 2016 13:40:23 +0000 (+0200)
Subject: Merge pull request #9170 from Yan-waller/yj-wip-fixrgwnew
X-Git-Tag: v11.0.1~107
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ecfe73096fa769061a25dc3c6ba61e60fc4c097e;p=ceph-ci.git

Merge pull request #9170 from Yan-waller/yj-wip-fixrgwnew

rgw/admin: fix some return values and indents
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

ecfe73096fa769061a25dc3c6ba61e60fc4c097e
diff --cc src/rgw/rgw_admin.cc
index 04a81f3ea07,8938346e9d8..db805067506
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@@ -3227,9 -3178,9 +3227,9 @@@ int main(int argc, char **argv
  	int ret = zonegroupmap.read(g_ceph_context, store);
  	if (ret < 0 && ret != -ENOENT) {
  	  cerr << "failed to read zonegroupmap info: " << cpp_strerror(ret);
- 	  return ret;
+ 	  return -ret;
  	}
 -		
 +
  	encode_json("zonegroup-map", zonegroupmap, formatter);
  	formatter->flush(cout);
        }
@@@ -3879,11 -3819,10 +3879,11 @@@
        jf.flush(bl);
  
        JSONParser p;
 -      ret = send_to_remote_gateway(url, info, bl, p);
 +      ret = send_to_remote_or_url(remote, url, access_key, secret_key,
 +                                  info, bl, p);
        if (ret < 0) {
          cerr << "request failed: " << cpp_strerror(-ret) << std::endl;
-         return ret;
+         return -ret;
        }
      }
      return 0;