]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-coverity-20140409'
authorSage Weil <sage@inktank.com>
Fri, 14 Mar 2014 20:04:21 +0000 (13:04 -0700)
committerSage Weil <sage@inktank.com>
Fri, 14 Mar 2014 20:04:21 +0000 (13:04 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/mon/MDSMonitor.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/rgw/rgw_rados.h
src/test/osd/RadosModel.h

Simple merge
index 8a45177fd1d0464fac38fc12d13a653c0bc63049,2737d0d5cf6ea59c6d0fe0a945330d0c36da76dc..52a77174c0febf50d558623bb48e1eb69add89f3
@@@ -122,10 -122,9 +122,10 @@@ public
      snapid_t snap_seq;       ///< src's snap_seq (if head)
      librados::snap_set_t snapset; ///< src snapset (if head)
      bool mirror_snapset;
 +    map<string, bufferlist> attrs; ///< src user attrs
      CopyResults() : object_size(0), started_temp_obj(false),
-                   user_version(0), should_requeue(false),
-                   mirror_snapset(false) {}
+                   final_tx(NULL), user_version(0), 
+                   should_requeue(false), mirror_snapset(false) {}
    };
  
    struct CopyOp {
Simple merge
Simple merge
Simple merge
Simple merge