← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/api/uniter/relationunit.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/state/api/uniter/relationunit.go
75
75
                        Unit:     ru.unit.tag,
76
76
                }},
77
77
        }
78
 
        err := ru.st.caller.Call("Uniter", "", "EnterScope", args, &result)
 
78
        err := ru.st.call("EnterScope", args, &result)
79
79
        if err != nil {
80
80
                return err
81
81
        }
95
95
                        Unit:     ru.unit.tag,
96
96
                }},
97
97
        }
98
 
        err := ru.st.caller.Call("Uniter", "", "LeaveScope", args, &result)
 
98
        err := ru.st.call("LeaveScope", args, &result)
99
99
        if err != nil {
100
100
                return err
101
101
        }
112
112
                        Unit:     ru.unit.tag,
113
113
                }},
114
114
        }
115
 
        err := ru.st.caller.Call("Uniter", "", "ReadSettings", args, &results)
 
115
        err := ru.st.call("ReadSettings", args, &results)
116
116
        if err != nil {
117
117
                return nil, err
118
118
        }
143
143
                        RemoteUnit: tag,
144
144
                }},
145
145
        }
146
 
        err := ru.st.caller.Call("Uniter", "", "ReadRemoteSettings", args, &results)
 
146
        err := ru.st.call("ReadRemoteSettings", args, &results)
147
147
        if err != nil {
148
148
                return nil, err
149
149
        }
167
167
                        Unit:     ru.unit.tag,
168
168
                }},
169
169
        }
170
 
        err := ru.st.caller.Call("Uniter", "", "WatchRelationUnits", args, &results)
 
170
        err := ru.st.call("WatchRelationUnits", args, &results)
171
171
        if err != nil {
172
172
                return nil, err
173
173
        }