]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: relam set can use input redirection
authorOrit Wasserman <owasserm@redhat.com>
Sun, 1 Jan 2017 10:40:37 +0000 (12:40 +0200)
committerNathan Cutler <ncutler@suse.com>
Sun, 29 Jan 2017 11:34:37 +0000 (12:34 +0100)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit b8b3ae3be3f8e4c05cb23062d25c701b15900475)

Conflicts:
src/rgw/rgw_admin.cc ("return EINVAL" in master, "return -EINVAL" in
              jewel; but it's irrelevant because the whole block is deleted)

src/rgw/rgw_admin.cc

index 294d9e130b2c89f4002a8f992a657e38d402f0d0..c161db04a86562d041f101734c1184a2e8ebe0eb 100644 (file)
@@ -2707,10 +2707,6 @@ int main(int argc, char **argv)
          cerr << "no realm name or id provided" << std::endl;
          return -EINVAL;
        }
-        if (infile.empty()) {
-         cerr << "no realm input file provided" << std::endl;
-         return -EINVAL;
-        }
        RGWRealm realm(realm_id, realm_name);
        bool new_realm = false;
        int ret = realm.init(g_ceph_context, store);