]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Sage Weil  [Thu, 8 Jun 2017 22:17:41 +0000  (18:17 -0400)] 
qa/suites/rados/basic-luminous/scrub_test: skip final scrubSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Wed, 31 May 2017 18:10:11 +0000  (14:10 -0400)] 
qa/suites/rados/basic/repair_test: skip final scrubSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 26 May 2017 13:24:03 +0000  (09:24 -0400)] 
qa/tasks/ceph: raise exception if scrubs time outSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 26 May 2017 13:23:13 +0000  (09:23 -0400)] 
qa/tasks/ceph: raise an exception if pgs are not cleanSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 26 May 2017 13:22:37 +0000  (09:22 -0400)] 
qa/tasks/ceph: osd_scrub_pgs: try a bit longerSigned-off-by: Sage Weil <sage@redhat.com> 
John Spray  [Thu, 15 Jun 2017 14:50:44 +0000  (10:50 -0400)] 
Merge pull request #15308 from jcsp/wip-19706Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
John Spray  [Thu, 15 Jun 2017 14:50:07 +0000  (10:50 -0400)] 
Merge pull request #15411 from jcsp/wip-fs-suiteReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Thu, 15 Jun 2017 14:46:08 +0000  (09:46 -0500)] 
Merge pull request #15708 from markhpc/wip-bluestore-shard_targetReviewed-by: Sage Weil <sage@redhat.com> 
Casey Bodley  [Thu, 15 Jun 2017 14:15:06 +0000  (10:15 -0400)] 
Merge pull request #15082 from joke-lee/fix-website-redirect-request-to-masterReviewed-by: Casey Bodley <cbodley@redhat.com> 
Casey Bodley  [Thu, 15 Jun 2017 14:13:48 +0000  (10:13 -0400)] 
Merge pull request #15617 from joke-lee/fix_put_bucket_policy_when_set_againReviewed-by: Casey Bodley <cbodley@redhat.com> 
Sage Weil  [Thu, 15 Jun 2017 14:00:03 +0000  (09:00 -0500)] 
Merge pull request #15631 from xiexingguo/wip-bluestore-
20170612 
os/bluestore: stop calculating bound if we must reshard; narrow shard combination condition
Reviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 15 Jun 2017 13:59:43 +0000  (08:59 -0500)] 
Merge pull request #15636 from tsg-/isal-ec-avx512
Sage Weil  [Thu, 15 Jun 2017 13:59:14 +0000  (08:59 -0500)] 
Merge pull request #15639 from liewegas/wip-20167Reviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Thu, 15 Jun 2017 13:58:50 +0000  (08:58 -0500)] 
Merge pull request #15641 from jecluis/wip-mon-deprecate-osd-createReviewed-by: Sage Weil <sage@redhat.com> 
Mark Nelson  [Thu, 15 Jun 2017 13:23:23 +0000  (08:23 -0500)] 
os/Bluestore: target_bytes should scale with meta/data ratios.Signed-off-by: Mark Nelson <mnelson@redhat.com> 
Kefu Chai  [Thu, 15 Jun 2017 08:12:04 +0000  (16:12 +0800)] 
Merge pull request #15646 from tchaikov/wip-20258Reviewed-by: Boris Ranto <branto@redhat.com> 
Kefu Chai  [Thu, 15 Jun 2017 02:14:59 +0000  (10:14 +0800)] 
pybind/mgr/restful: return 400 on bad requestSigned-off-by: Kefu Chai <kchai@redhat.com> 
Orit Wasserman  [Thu, 15 Jun 2017 06:32:45 +0000  (09:32 +0300)] 
Merge pull request #15694 from cbodley/wip-qa-rgw-thrash-encryption
Brad Hubbard  [Thu, 15 Jun 2017 02:58:17 +0000  (12:58 +1000)] 
Merge pull request #15684 from badone/wip-refactor-of-osdmap-methodsReviewed-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Thu, 15 Jun 2017 02:52:11 +0000  (10:52 +0800)] 
Merge pull request #15692 from joscollin/wip-test-mon-Wreorder-warningReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 15 Jun 2017 02:23:29 +0000  (10:23 +0800)] 
Revert "qa/suites/rados/rest/mgr-restful: test on centos"
This reverts commit 
be88220965c37f2f36c61368f465a197ac76bed3 .
we can workaround the limit of old requests by using the backward
compatible way.
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 15 Jun 2017 02:13:12 +0000  (10:13 +0800)] 
qa/workunits/rest/test_mgr_rest_api.py: set headers for requestsSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 13 Jun 2017 02:37:49 +0000  (10:37 +0800)] 
pybind/mgr/restful: use list to pass hooks to create a `Pecan` instance
pecan 0.3.2 introduced the new way to pass the hooks to construct a
Pecan instance, but the "callable" builder for hooks is not compatible
with pecan < 0.3.2. and ubuntu trusty ships pecan 0.3.0, so we need to
do this the old way: pass a list of hooks instead of a callable.
see https://github.com/pecan/pecan/blame/0.3.2/pecan/core.py and
https://github.com/pecan/pecan/commit/
fb2cf166aaf5b5af461879ec5b7a46806e8aee45 
Fixes: http://tracker.ceph.com/issues/20258 
Signed-off-by: Kefu Chai <kchai@redhat.com> 
Jos Collin  [Wed, 14 Jun 2017 15:04:44 +0000  (20:34 +0530)] 
test/mon: silence warnings from -WreorderSigned-off-by: Jos Collin <jcollin@redhat.com> 
yuliyang  [Mon, 15 May 2017 08:49:13 +0000  (16:49 +0800)] 
rgw-multisite: fix the problem of rgw website configure request not redirect to metadata masterSigned-off-by: yuliyang <yuliyang@cmss.chinamobile.com> 
Casey Bodley  [Wed, 14 Jun 2017 20:23:35 +0000  (16:23 -0400)] 
qa/rgw: add encryption config for s3tests under thrashSigned-off-by: Casey Bodley <cbodley@redhat.com> 
Yuri Weinstein  [Wed, 14 Jun 2017 20:11:58 +0000  (13:11 -0700)] 
Merge pull request #15381 from xiexingguo/wip-noout-osdlistReviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com> 
Yuri Weinstein  [Wed, 14 Jun 2017 20:10:05 +0000  (13:10 -0700)] 
Merge pull request #15535 from gregsfortytwo/wip-jumbo-pingReviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Haomai Wang <haomai@xsky.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Yuri Weinstein  [Wed, 14 Jun 2017 20:07:43 +0000  (13:07 -0700)] 
Merge pull request #15645 from yuyuyu101/wip-20230Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Alexey Sheplyakov <asheplyakov@mirantis.com> 
Kefu Chai  [Wed, 14 Jun 2017 16:40:28 +0000  (00:40  +0800)] 
Merge pull request #15376 from tchaikov/wip-remove-boost-submoduleReviewed-by: Casey Bodley <cbodley@redhat.com> 
Radoslaw Zarzynski  [Wed, 14 Jun 2017 16:11:18 +0000  (18:11 +0200)] 
Merge pull request #15269 from theanalyst/rgw/env-fixReviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com> 
Kefu Chai  [Wed, 14 Jun 2017 15:57:32 +0000  (23:57 +0800)] 
Merge pull request #15690 from jcsp/wip-mgr-docReviewed-by: Greg Farnum <gfarnum@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 14 Jun 2017 03:38:53 +0000  (11:38 +0800)] 
cmake: do not link libmon with mon_common_objsSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 1 Jun 2017 02:26:50 +0000  (10:26 +0800)] 
cmake: move common/util.cc into ceph-commonSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Wed, 31 May 2017 04:06:26 +0000  (12:06 +0800)] 
cmake: do not include Monitor.cc in osdSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 30 May 2017 16:25:59 +0000  (00:25  +0800)] 
common: #include <atomic> in headers where atomic<> is usedSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sun, 16 Apr 2017 05:04:16 +0000  (13:04 +0800)] 
cmake: include boost before default system directorySigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sun, 16 Apr 2017 05:03:52 +0000  (13:03 +0800)] 
cmake: build boost as an external projectSigned-off-by: Kefu Chai <kchai@redhat.com> 
Adam C. Emerson  [Wed, 14 Jun 2017 15:25:52 +0000  (11:25 -0400)] 
Merge pull request #15607 from joke-lee/fix_bucket_policy_IfExists
Casey Bodley  [Wed, 14 Jun 2017 15:14:28 +0000  (11:14 -0400)] 
Merge pull request #15686 from mikulely/drop-header-endedReviewed-by: Abhishek Lekshmanan <abhishek@suse.com> Reviewed-by: Casey Bodley <cbodley@redhat.com> 
John Spray  [Wed, 14 Jun 2017 14:04:22 +0000  (10:04 -0400)] 
doc/mgr: update for mgr_beacon_period changeSigned-off-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:53:49 +0000  (09:53 -0400)] 
doc/mgr: flesh out introductory textSigned-off-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:53:26 +0000  (09:53 -0400)] 
doc/mgr: fix auth keys instructionSigned-off-by: John Spray <john.spray@redhat.com> 
John Spray  [Wed, 14 Jun 2017 13:52:58 +0000  (09:52 -0400)] 
doc/install: reference mgr manual setupSigned-off-by: John Spray <john.spray@redhat.com> 
Orit Wasserman  [Wed, 14 Jun 2017 13:04:32 +0000  (16:04 +0300)] 
Merge pull request #15688 from rzarzynski/wip-rgw-fix-auth-for-clang
Abhishek Lekshmanan  [Wed, 14 Jun 2017 12:27:05 +0000  (14:27 +0200)] 
rgw: make RGWEnv return a const ref. to its mapSigned-off-by: Abhishek Lekshmanan <abhishek@suse.com> 
Nathan Cutler  [Wed, 14 Jun 2017 11:33:26 +0000  (13:33 +0200)] 
Merge pull request #15399 from smithfarm/wip-20127Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Boris Ranto <branto@redhat.com> 
Radoslaw Zarzynski  [Wed, 14 Jun 2017 10:05:55 +0000  (12:05 +0200)] 
rgw: don't use strlen in constexprs to not brake Clang builds.Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com> 
Nathan Cutler  [Thu, 8 Jun 2017 07:35:57 +0000  (09:35 +0200)] 
build/ops: rpm: one License line to rule them allSigned-off-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Fri, 26 May 2017 08:22:50 +0000  (10:22 +0200)] 
build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf ExceptionFixes: http://tracker.ceph.com/issues/20091 Signed-off-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Thu, 12 Jan 2017 11:32:50 +0000  (12:32 +0100)] 
build/ops: rpm: Enable ppc64le and s390x builds in SLESigned-off-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Fri, 2 Jun 2017 08:12:01 +0000  (10:12 +0200)] 
build/ops: rpm: ceph.spec.in: drop redundant defattrsSigned-off-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Wed, 31 May 2017 23:12:11 +0000  (01:12  +0200)] 
build/ops: rpm: add which as a build dependency, unconditionallyFixes: http://tracker.ceph.com/issues/20127 Signed-off-by: Nathan Cutler <ncutler@suse.com> 
Nathan Cutler  [Wed, 31 May 2017 22:56:20 +0000  (00:56  +0200)] 
build/ops: make sure which is installed in run-make-check.shFixes: http://tracker.ceph.com/issues/20127 Signed-off-by: Nathan Cutler <ncutler@suse.com> 
Xie Xingguo  [Wed, 14 Jun 2017 10:07:50 +0000  (18:07 +0800)] 
Merge pull request #15664 from zealoussnow/wip-fix-docReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Xie Xingguo  [Wed, 14 Jun 2017 10:06:05 +0000  (18:06 +0800)] 
Merge pull request #15681 from zealoussnow/wip-option-comment-errorReviewed-by: Kefu Chai <kchai@redhat.com> 
Jiaying Ren  [Wed, 14 Jun 2017 09:54:06 +0000  (17:54 +0800)] 
rgw: drop unused var header_endedSigned-off-by: Jiaying Ren <jiaying.ren@umcloud.com> 
Brad Hubbard  [Wed, 14 Jun 2017 08:40:35 +0000  (18:40 +1000)] 
osd: Change *pg_to_* to return voidSigned-off-by: Brad Hubbard <bhubbard@redhat.com> 
Leo Zhang  [Wed, 14 Jun 2017 07:55:03 +0000  (15:55 +0800)] 
common: fix option "rados_mon_op_timeout" comment spell errorSigned-off-by: Leo Zhang <nguzcf@gmail.com> 
Kefu Chai  [Sun, 16 Apr 2017 05:02:55 +0000  (13:02 +0800)] 
cmake: use boost target instead of libary path while linking against themSigned-off-by: Kefu Chai <kchai@redhat.com> 
Matt Benjamin  [Tue, 13 Jun 2017 21:16:20 +0000  (17:16 -0400)] 
Merge pull request #14885 from rzarzynski/wip-rgw-auth-rework-cont-3-awsv4
Greg Farnum  [Mon, 5 Jun 2017 20:33:14 +0000  (13:33 -0700)] 
osd: heartbeat with packets large enough to require working jumbo frames.Fixes: http://tracker.ceph.com/issues/20087 Signed-off-by: Greg Farnum <gfarnum@redhat.com> 
Orit Wasserman  [Tue, 13 Jun 2017 17:46:25 +0000  (20:46 +0300)] 
Merge pull request #14344 from rzarzynski/wip-rgw-repect-negative-refacls
Adam C. Emerson  [Tue, 13 Jun 2017 16:54:02 +0000  (12:54 -0400)] 
Merge pull request #15586 from adamemerson/wip-ex-MLReviewed-by: Orit Wasserman <owasserm@redhat.com> 
Adam C. Emerson  [Thu, 8 Jun 2017 21:51:34 +0000  (17:51 -0400)] 
rgw: Remove spurious XML header for GetBucketPolicyFixes: http://tracker.ceph.com/issues/20247 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> 
Radoslaw Zarzynski  [Tue, 13 Jun 2017 15:28:49 +0000  (17:28 +0200)] 
Merge pull request #15564 from Jing-Scott/fix-formpost-authReviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com> 
Sage Weil  [Tue, 13 Jun 2017 15:26:55 +0000  (10:26 -0500)] 
Merge pull request #15581 from neha-ojha/wip-fix-objclassReviewed-by: Josh Durgin <jdurgin@redhat.com> 
Sage Weil  [Tue, 13 Jun 2017 15:26:34 +0000  (10:26 -0500)] 
Merge pull request #15595 from ztczll/zlReviewed-by: Sage Weil <sage@redhat.com> 
Yuri Weinstein  [Tue, 13 Jun 2017 15:18:42 +0000  (08:18 -0700)] 
Merge pull request #15590 from Linbing/wip-osd-check-osdmap-twiceReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 13 Jun 2017 14:56:12 +0000  (22:56 +0800)] 
Merge pull request #15661 from tchaikov/wip-qa-upgrade-set-sortbitwiseReviewed-by: Sage Weil <sage@redhat.com> 
Haomai Wang  [Tue, 13 Jun 2017 02:19:55 +0000  (10:19 +0800)] 
msg/async: go to open new session when existing already closedFixes: http://tracker.ceph.com/issues/20230 Signed-off-by: Haomai Wang <haomai@xsky.com> 
Casey Bodley  [Tue, 13 Jun 2017 14:37:27 +0000  (10:37 -0400)] 
Merge pull request #15613 from cbodley/wip-20244Reviewed-by: Orit Wasserman <owasserm@redhat.com> 
Casey Bodley  [Tue, 13 Jun 2017 14:27:47 +0000  (10:27 -0400)] 
Merge pull request #15280 from ZVampirEM77/wip-bucket-policy-cleanupReviewed-by: Adam C. Emerson <aemerson@redhat.com> 
Kefu Chai  [Tue, 13 Jun 2017 13:07:24 +0000  (21:07 +0800)] 
Merge pull request #15663 from zealoussnow/wip-fix-buildReviewed-by: Kefu Chai <kchai@redhat.com> 
Matt Benjamin  [Tue, 13 Jun 2017 12:40:48 +0000  (08:40 -0400)] 
Merge pull request #15655 from guihecheng/rgw_file-fix-mkdir
Igor Fedotov  [Tue, 13 Jun 2017 12:24:50 +0000  (16:24 +0400)] 
Merge pull request #15659 from lixiaoy1/fio_ceph
lisali  [Tue, 13 Jun 2017 16:41:04 +0000  (12:41 -0400)] 
Fix assert in set_cache_shards in bluestore fioSigned-off-by: Xiaoyan Li <xiaoyan.li@intel.com> 
Mykola Golub  [Tue, 13 Jun 2017 12:10:25 +0000  (15:10 +0300)] 
Merge pull request #15593 from chenfangxian/rbd-nbd-fix-unmapReviewed-by: Mykola Golub <mgolub@mirantis.com> Reviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com> 
Leo Zhang  [Tue, 13 Jun 2017 11:57:07 +0000  (19:57 +0800)] 
doc: remove some non-existent and fix the default value according to source codeSigned-off-by: Leo Zhang <nguzcf@gmail.com> 
Leo Zhang  [Tue, 13 Jun 2017 11:43:54 +0000  (19:43 +0800)] 
build: add css file to excludes while generate tagsSigned-off-by: Leo Zhang <nguzcf@gmail.com> 
Jing Wenjun  [Thu, 8 Jun 2017 07:15:28 +0000  (15:15 +0800)] 
rgw: fix the signature mismatch of FormPost in swift APIFixes: http://tracker.ceph.com/issues/20220 Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com> 
Kefu Chai  [Tue, 13 Jun 2017 08:59:47 +0000  (16:59 +0800)] 
qa/suites/upgrade: remove duplicated upgrade taskSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 13 Jun 2017 08:58:13 +0000  (16:58 +0800)] 
qa/suites/upgrade: set "sortbitwise" for jewel clustersSigned-off-by: Kefu Chai <kchai@redhat.com> 
Gui Hecheng  [Tue, 13 Jun 2017 06:39:14 +0000  (14:39 +0800)] 
rgw_file: prevent conflict of mkdir between restartsFixes: http://tracker.ceph.com/issues/20275 Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com> 
Gregory Farnum  [Tue, 13 Jun 2017 04:20:18 +0000  (00:20  -0400)] 
Merge pull request #15648 from joscollin/wip-CID1412575-incorrect-expressionReviewed-by: Greg Farnum <gfarnum@redhat.com> 
Kefu Chai  [Tue, 13 Jun 2017 03:40:53 +0000  (11:40 +0800)] 
Merge pull request #15638 from liewegas/wip-19948Reviewed-by: Brad Hubbard <bhubbard@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
chenfangxian  [Tue, 13 Jun 2017 03:05:51 +0000  (11:05 +0800)] 
rbd-nbd: fix nbd do_unmap error handlingSigned-off-by: chenfangxian <chenfangxian@cmss.chinamobile.com> Signed-off-by: guojiannan <guojiannan@cmss.chinamobile.com> 
Sage Weil  [Tue, 13 Jun 2017 03:01:05 +0000  (22:01 -0500)] 
Merge pull request #15519 from liewegas/wip-19595Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Jos Collin  [Tue, 13 Jun 2017 02:54:17 +0000  (08:24 +0530)] 
mon: Incorrect expression in PGMap::get_health()
Fixes:
CID 
1412575 :  Incorrect expression  (COPY_PASTE_ERROR)
ceph/src/mon/PGMap.cc: 2764 in PGMap::get_health()
"num_err" in "ss2 << num_err" looks like a copy-paste error.
Signed-off-by: Jos Collin <jcollin@redhat.com> 
Haomai Wang  [Tue, 13 Jun 2017 02:26:35 +0000  (10:26 +0800)] 
Merge pull request #15629 from Linbing/wip-msg-async-op-threadsReviewed-by: Haomai Wang <haomai@xsky.com> 
Haomai Wang  [Tue, 13 Jun 2017 02:16:47 +0000  (10:16 +0800)] 
msg/async: fix accept_conn not remove entry in conns when lazy deleteSigned-off-by: Haomai Wang <haomai@xsky.com> 
Yehuda Sadeh  [Mon, 12 Jun 2017 20:07:43 +0000  (13:07 -0700)] 
Merge pull request #15426 from zhangsw/fix-rgw-gc-loglevelReviewed-by: Casey Bodley <cbodley@redhat.com> 
Casey Bodley  [Mon, 12 Jun 2017 20:03:21 +0000  (16:03 -0400)] 
Merge pull request #15571 from ceph/wip-fix-fio-shard-hintReviewed-by: Casey Bodley <cbodley@redhat.com> 
Joao Eduardo Luis  [Mon, 12 Jun 2017 19:53:47 +0000  (20:53 +0100)] 
mon: mark `osd create` as deprecatedSigned-off-by: Joao Eduardo Luis <joao@suse.de> 
Sage Weil  [Mon, 12 Jun 2017 19:40:49 +0000  (15:40 -0400)] 
osd/PG: make non-empty PastIntervals non-fatalSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 12 Jun 2017 19:13:21 +0000  (14:13 -0500)] 
Merge pull request #15603 from idryomov/wip-rados-df-typo
Sage Weil  [Mon, 12 Jun 2017 19:12:40 +0000  (14:12 -0500)] 
Merge pull request #15615 from joscollin/wip-CID717210-Uninitialized-membersReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Sage Weil  [Mon, 12 Jun 2017 19:06:40 +0000  (14:06 -0500)] 
Merge pull request #15627 from theanalyst/12.1.0/release-notes-2
Sage Weil  [Mon, 12 Jun 2017 18:57:22 +0000  (14:57 -0400)] 
ceph_test_rados_api_*: wait for snap trim on ENOENT during cleanupFixes: http://tracker.ceph.com/issues/19948 Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Mon, 12 Jun 2017 18:05:41 +0000  (14:05 -0400)] 
osd/PrimaryLogPG: clear oi from trim_object()Fixes: http://tracker.ceph.com/issues/19947 Signed-off-by: Sage Weil <sage@redhat.com>