Merge lp:~fabien-morin/unifield-wm/sync-fm-sp-215 into lp:unifield-wm/sync

Proposed by jftempo
Status: Merged
Merged at revision: 638
Proposed branch: lp:~fabien-morin/unifield-wm/sync-fm-sp-215
Merge into: lp:unifield-wm/sync
Diff against target: 20 lines (+2/-2)
1 file modified
sync_server/rules.py (+2/-2)
To merge this branch: bzr merge lp:~fabien-morin/unifield-wm/sync-fm-sp-215
Reviewer Review Type Date Requested Status
UniField Sync Reviewer Pending
Review via email: mp+287272@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 'sync_server/rules.py'
2--- sync_server/rules.py 2016-01-15 12:59:17 +0000
3+++ sync_server/rules.py 2016-02-26 09:19:42 +0000
4@@ -141,7 +141,7 @@
5 'master_data': True,
6 'domain': '[]',
7 'active': False,
8- 'status': 'invalid',
9+ 'status': 'valid',
10 'handle_priority' : False,
11 }
12
13@@ -585,7 +585,7 @@
14 _defaults = {
15 'domain': '[]',
16 'active': False,
17- 'status': 'invalid',
18+ 'status': 'valid',
19 'applies_to_type' : True,
20 }
21

Subscribers

People subscribed via source and target branches