Merge lp:~ralsina/ubuntuone-client/exorcize-daemon into lp:ubuntuone-client
Proposed by
Roberto Alsina
on 2012-09-18
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart on 2012-09-18 |
| Approved revision: | 1315 |
| Merged at revision: | 1314 |
| Proposed branch: | lp:~ralsina/ubuntuone-client/exorcize-daemon |
| Merge into: | lp:ubuntuone-client |
| Diff against target: |
12 lines (+1/-1) 1 file modified
data/syncdaemon.conf (+1/-1) |
| To merge this branch: | bzr merge lp:~ralsina/ubuntuone-client/exorcize-daemon |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart | Approve on 2012-09-18 | ||
| Diego Sarmentero (community) | 2012-09-18 | Approve on 2012-09-18 | |
|
Review via email:
|
|||
Commit Message
- Set fsm back to default by default (Fix lp:1052462)
Description of the Change
On Ubuntu and windows, there isn't a "daemon" fsm, so we can't have that as default here.
Reverting revno 1311
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