]> git.pld-linux.org Git - packages/ceph.git/blob - ceph-boost.patch
- updated to 0.87
[packages/ceph.git] / ceph-boost.patch
1 --- ceph-0.87/src/osd/ECBackend.cc.orig 2014-10-14 14:22:35.000000000 +0200
2 +++ ceph-0.87/src/osd/ECBackend.cc      2014-10-19 20:21:00.537672741 +0200
3 @@ -81,7 +81,7 @@
4    lhs << "read_result_t(r=" << rhs.r
5        << ", errors=" << rhs.errors;
6    if (rhs.attrs) {
7 -    lhs << ", attrs=" << rhs.attrs;
8 +    lhs << ", attrs=" << rhs.attrs.get();
9    } else {
10      lhs << ", noattrs";
11    }
12 --- ceph-0.87/src/osd/ReplicatedPG.cc.orig      2014-10-14 14:22:35.000000000 +0200
13 +++ ceph-0.87/src/osd/ReplicatedPG.cc   2014-10-19 20:23:41.797665908 +0200
14 @@ -5271,7 +5271,10 @@
15    for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
16         p != ctx->notify_acks.end();
17         ++p) {
18 -    dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
19 +    if (p->watch_cookie)
20 +    dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
21 +    else
22 +    dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
23      for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
24            ctx->obc->watchers.begin();
25          i != ctx->obc->watchers.end();
This page took 0.06086 seconds and 3 git commands to generate.