]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #458 from ceph/wip-5693
authorGregory Farnum <greg@inktank.com>
Mon, 22 Jul 2013 21:37:29 +0000 (14:37 -0700)
committerGregory Farnum <greg@inktank.com>
Mon, 22 Jul 2013 21:37:29 +0000 (14:37 -0700)
Wip 5693
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest_s3.cc

Simple merge
index e107b90a155693f44cccac6441d3e320794c3f94,0c338dea8a97876a76dbb49382045230a70db4bc..5da2e4f472c7a6cb4a26ed01aacb72979623bdd9
@@@ -471,8 -475,9 +475,9 @@@ public
  
    virtual int init_dest_policy() { return 0; }
    virtual int get_params() = 0;
+   virtual void send_partial_response(off_t ofs) {}
    virtual void send_response() = 0;
 -  virtual const char *name() { return "copy_obj"; }
 +  virtual const string name() { return "copy_obj"; }
    virtual uint32_t op_mask() { return RGW_OP_TYPE_WRITE; }
  };
  
Simple merge
Simple merge
Simple merge