]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Updated with latest ceph/main
authorDattaprasad Govekar <dattaprasad.govekar@seagate.com>
Mon, 27 Jun 2022 05:24:05 +0000 (23:24 -0600)
committerDattaprasad Govekar <dattaprasad.govekar@seagate.com>
Mon, 27 Jun 2022 05:24:05 +0000 (23:24 -0600)
Fixed compilation issue in src/rgw/rgw_sal_motr.h.

Signed-off-by: Dattaprasad Govekar <dattaprasad.govekar@seagate.com>
ceph-erasure-code-corpus
src/blkin
src/crypto/isa-l/isa-l_crypto
src/erasure-code/jerasure/gf-complete
src/erasure-code/jerasure/jerasure
src/isa-l
src/libkmip
src/rgw/rgw_sal_motr.h
src/rocksdb
src/s3select
src/utf8proc

index 2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7..ec6b7303cfb36822f91d719351e4637083fa28c1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7
+Subproject commit ec6b7303cfb36822f91d719351e4637083fa28c1
index f24ceec055ea236a093988237a9821d145f5f7c8..f73d3ffeb78eef9c228f101f6f8319f728b401ac 160000 (submodule)
--- a/src/blkin
+++ b/src/blkin
@@ -1 +1 @@
-Subproject commit f24ceec055ea236a093988237a9821d145f5f7c8
+Subproject commit f73d3ffeb78eef9c228f101f6f8319f728b401ac
index 603529a4e06ac8a1662c13d6b31f122e21830352..ecad4d3d5003883a9edcc0996f025adc34bb2ade 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 603529a4e06ac8a1662c13d6b31f122e21830352
+Subproject commit ecad4d3d5003883a9edcc0996f025adc34bb2ade
index 7e61b44404f0ed410c83cfd3947a52e88ae044e1..a6862d10c9db467148f20eef2c6445ac9afd94d8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7e61b44404f0ed410c83cfd3947a52e88ae044e1
+Subproject commit a6862d10c9db467148f20eef2c6445ac9afd94d8
index 96c76b89d661c163f65a014b8042c9354ccf7f31..de1739cc8483696506829b52e7fda4f6bb195e6a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 96c76b89d661c163f65a014b8042c9354ccf7f31
+Subproject commit de1739cc8483696506829b52e7fda4f6bb195e6a
index bee5180a1517f8b5e70b02fcd66790c623536c5d..1db0363c49679494fc9a22aab08255f8017e00a8 160000 (submodule)
--- a/src/isa-l
+++ b/src/isa-l
@@ -1 +1 @@
-Subproject commit bee5180a1517f8b5e70b02fcd66790c623536c5d
+Subproject commit 1db0363c49679494fc9a22aab08255f8017e00a8
index b25cde94c9b8686988ed1236bd807afe74991333..4f553ecaf8e57cc3019222b8551d17888f0a1e66 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b25cde94c9b8686988ed1236bd807afe74991333
+Subproject commit 4f553ecaf8e57cc3019222b8551d17888f0a1e66
index 35fa92a60665a8f93d983f9f9e9098b482f8f143..0c74e0a50597e8c570b38812e4d565205aea8409 100644 (file)
@@ -489,10 +489,9 @@ class MotrZone : public Zone {
     }
     MotrZone(MotrStore* _store, MotrZoneGroup _zg) : store(_store), zonegroup(_zg) {
       realm = new RGWRealm();
-      zonegroup = new RGWZoneGroup();
       // TODO: fetch zonegroup params (eg. id) from provisioner config.
-      zonegroup->set_id("0956b174-fe14-4f97-8b50-bb7ec5e1cf62");
-      zonegroup->api_name = "default";
+      zonegroup.set_id("0956b174-fe14-4f97-8b50-bb7ec5e1cf62");
+      zonegroup.api_name = "default";
       zone_public_config = new RGWZone();
       zone_params = new RGWZoneParams();
       current_period = new RGWPeriod();
index c540de6f709b66efd41436694f72d6f7986a325b..bc7e8d472e7d37a33f3f45dec393769011ec1e08 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c540de6f709b66efd41436694f72d6f7986a325b
+Subproject commit bc7e8d472e7d37a33f3f45dec393769011ec1e08
index 825598ac92dfb889a2107b85d461e9e673838450..fe5f7e14d14ef2f6dec30b82552452d2ddbeb3ce 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 825598ac92dfb889a2107b85d461e9e673838450
+Subproject commit fe5f7e14d14ef2f6dec30b82552452d2ddbeb3ce
index 97ef668b312b96382714dbb8eaac4affce0816e6..63f31c908ef7656415f73d6c178f08181239f74c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 97ef668b312b96382714dbb8eaac4affce0816e6
+Subproject commit 63f31c908ef7656415f73d6c178f08181239f74c