Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-3368 into lp:unifield-server

  1. fm-us-3368
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4494
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-3368
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/sync_client/operations.py (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-3368
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+330425@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sync_client/operations.py'
2--- bin/addons/sync_client/operations.py 2017-08-21 09:23:16 +0000
3+++ bin/addons/sync_client/operations.py 2017-09-08 14:23:22 +0000
4@@ -346,7 +346,7 @@
5 'instance': fields.char('Instance', readonly=True, size=64, required=True, help="The originating instance."),
6 'remote_id': fields.integer('Remote id', help="Holds the row id of rows imported from a remote instance. Unused except for de-duplicating during count centralization."),
7 'process': fields.char('Process', readonly=True, size=64, required=True, help="Which process is concerned?"),
8- 'memory_usage': fields.integer('Memory Usage', readonly=True, required=True, help="Size of RAM (in bytes) used by the process.")
9+ 'memory_usage': fields.integer_big('Memory Usage', readonly=True, required=True, help="Size of RAM (in bytes) used by the process.")
10 }
11
12 _logger = logging.getLogger('memory.usage')

Subscribers

People subscribed via source and target branches