Twisted

Merge lp:~mwhudson/twisted/fix-FILEXFER_ATTR_ACMODTIME into lp:~launchpad-pqm/twisted/trunk

  1. fix-FILEXFER_ATTR_ACMODTIME
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Tim Penhey
Approved revision: 17
Merged at revision: not available
Proposed branch: lp:~mwhudson/twisted/fix-FILEXFER_ATTR_ACMODTIME
Merge into: lp:~launchpad-pqm/twisted/trunk
Diff against target: 12 lines
1 file modified
twisted/conch/ssh/filetransfer.py (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/twisted/fix-FILEXFER_ATTR_ACMODTIME
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+13742@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

On Thu, 22 Oct 2009 10:50:24 Michael Hudson wrote:
> Michael Hudson has proposed merging
> lp:~mwhudson/twisted/fix-FILEXFER_ATTR_ACMODTIME into
> lp:~launchpad-pqm/twisted/trunk.
>
> Requested reviews:
> Tim Penhey (thumper)

  merge approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'twisted/conch/ssh/filetransfer.py'
--- twisted/conch/ssh/filetransfer.py 2008-04-07 05:13:50 +0000
+++ twisted/conch/ssh/filetransfer.py 2009-10-21 21:50:23 +0000
@@ -863,7 +863,7 @@
863FILEXFER_ATTR_SIZE = 0x00000001863FILEXFER_ATTR_SIZE = 0x00000001
864FILEXFER_ATTR_OWNERGROUP = 0x00000002864FILEXFER_ATTR_OWNERGROUP = 0x00000002
865FILEXFER_ATTR_PERMISSIONS = 0x00000004865FILEXFER_ATTR_PERMISSIONS = 0x00000004
866FILEXFER_ATTR_ACMODTIME = 0x00000009866FILEXFER_ATTR_ACMODTIME = 0x00000008
867FILEXFER_ATTR_EXTENDED = 0x80000000L867FILEXFER_ATTR_EXTENDED = 0x80000000L
868868
869FILEXFER_TYPE_REGULAR = 1869FILEXFER_TYPE_REGULAR = 1

Subscribers

People subscribed via source and target branches