From: Samuel Just <sam.just@inktank.com>
Date: Fri, 27 Jun 2014 20:27:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into wip-8438-master
X-Git-Tag: v0.84~171^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f59e405ef2cbf9d65a45dd041e16dde686dd9b3;p=ceph.git

Merge remote-tracking branch 'upstream/master' into wip-8438-master

Conflicts:
	src/osd/ECMsgTypes.cc
---

1f59e405ef2cbf9d65a45dd041e16dde686dd9b3
diff --cc src/osd/ECMsgTypes.cc
index 47ef3533f3374,ad434b296c1b3..282355fe21e34
--- a/src/osd/ECMsgTypes.cc
+++ b/src/osd/ECMsgTypes.cc
@@@ -77,9 -70,8 +77,9 @@@ void ECSubWrite::dump(Formatter *f) con
    f->dump_stream("reqid") << reqid;
    f->dump_stream("at_version") << at_version;
    f->dump_stream("trim_to") << trim_to;
 +  f->dump_stream("trim_rollback_to") << trim_rollback_to;
-   f->dump_stream("has_updated_hit_set_history")
-     << static_cast<bool>(updated_hit_set_history);
+   f->dump_bool("has_updated_hit_set_history",
+       static_cast<bool>(updated_hit_set_history));
  }
  
  void ECSubWrite::generate_test_instances(list<ECSubWrite*> &o)