Ubuntu Pastebin

Paste from dimitern at Fri, 18 Mar 2016 11:15:01 +0000

Download as text 
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
On branch multi-nic-master-fixes
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	modified:   Makefile
	modified:   agent/agent.go
	modified:   agent/agent_test.go
	modified:   agent/bootstrap_test.go
	modified:   agent/format-1.18.go
	modified:   agent/format-1.18_whitebox_test.go
	modified:   agent/format_whitebox_test.go
	modified:   agent/identity_test.go
	modified:   agent/tools/diskmanager.go
	modified:   agent/tools/diskmanager_test.go
	modified:   agent/tools/export_test.go
	modified:   agent/tools/tools.go
	modified:   agent/tools/tools_test.go
	modified:   agent/tools/toolsdir.go
	modified:   api/apiclient.go
	modified:   api/apiclient_test.go
	modified:   api/backups/restore.go
	modified:   api/client.go
	modified:   api/client_test.go
	modified:   api/export_test.go
	modified:   api/interface.go
	new file:   api/modelmanager/access_test.go
	new file:   api/modelmanager/export_test.go
	modified:   api/modelmanager/modelmanager.go
	modified:   api/provisioner/provisioner.go
	modified:   api/provisioner/provisioner_test.go
	modified:   api/state.go
	modified:   api/upgrader/unitupgrader_test.go
	modified:   api/upgrader/upgrader.go
	modified:   api/upgrader/upgrader_test.go
	modified:   api/usermanager/client.go
	modified:   api/usermanager/client_test.go
	modified:   apiserver/admin.go
	modified:   apiserver/admin_test.go
	modified:   apiserver/agenttools/agenttools.go
	modified:   apiserver/agenttools/agenttools_test.go
	modified:   apiserver/apiserver.go
	modified:   apiserver/client/client.go
	modified:   apiserver/client/client_test.go
	modified:   apiserver/client/perm_test.go
	modified:   apiserver/client/state.go
	modified:   apiserver/client/status.go
	modified:   apiserver/client_auth_root_test.go
	modified:   apiserver/common/errors.go
	modified:   apiserver/common/tools.go
	modified:   apiserver/common/tools_test.go
	modified:   apiserver/export_test.go
	new file:   apiserver/gui.go
	new file:   apiserver/gui_test.go
	modified:   apiserver/modelmanager/modelmanager.go
	modified:   apiserver/modelmanager/modelmanager_test.go
	modified:   apiserver/modelmanager/state.go
	modified:   apiserver/params/apierror.go
	modified:   apiserver/params/backups.go
	modified:   apiserver/params/internal.go
	modified:   apiserver/params/model.go
	modified:   apiserver/params/params.go
	modified:   apiserver/params/params_test.go
	modified:   apiserver/params/status.go
	modified:   apiserver/params/usermanager.go
	modified:   apiserver/restricted_root_test.go
	modified:   apiserver/service/charmstore.go
	modified:   apiserver/service/export_test.go
	modified:   apiserver/service/service.go
	modified:   apiserver/service/service_test.go
	modified:   apiserver/tools.go
	modified:   apiserver/tools_test.go
	modified:   apiserver/upgrader/unitupgrader.go
	modified:   apiserver/upgrader/unitupgrader_test.go
	modified:   apiserver/upgrader/upgrader.go
	modified:   apiserver/upgrader/upgrader_test.go
	modified:   apiserver/upgrading_root.go
	modified:   apiserver/upgrading_root_test.go
	modified:   apiserver/usermanager/usermanager.go
	modified:   apiserver/usermanager/usermanager_test.go
	modified:   cloud/credentials.go
	modified:   cloud/credentials_test.go
	modified:   cloudconfig/cloudinit/renderscript_test.go
	modified:   cloudconfig/instancecfg/instancecfg.go
	modified:   cloudconfig/instancecfg/instancecfg_test.go
	modified:   cloudconfig/providerinit/providerinit_test.go
	modified:   cloudconfig/userdatacfg_test.go
	modified:   cloudconfig/userdatacfg_unix.go
	modified:   cmd/juju/backups/export_test.go
	modified:   cmd/juju/backups/restore.go
	modified:   cmd/juju/backups/restore_test.go
	modified:   cmd/juju/cloud/addcredential.go
	modified:   cmd/juju/cloud/defaultregion_test.go
	modified:   cmd/juju/cloud/export_test.go
	modified:   cmd/juju/cloud/listcredentials.go
	new file:   cmd/juju/cloud/removecredential.go
	new file:   cmd/juju/cloud/removecredential_test.go
	modified:   cmd/juju/commands/bootstrap.go
	modified:   cmd/juju/commands/bootstrap_test.go
	modified:   cmd/juju/commands/main.go
	modified:   cmd/juju/commands/main_test.go
	modified:   cmd/juju/commands/synctools.go
	modified:   cmd/juju/commands/synctools_test.go
	modified:   cmd/juju/commands/upgradejuju.go
	modified:   cmd/juju/commands/upgradejuju_test.go
	new file:   cmd/juju/gui/export_test.go
	new file:   cmd/juju/gui/gui.go
	new file:   cmd/juju/gui/gui_test.go
	new file:   cmd/juju/gui/package_test.go
	modified:   cmd/juju/model/export_test.go
	modified:   cmd/juju/model/fakeenv_test.go
	new file:   cmd/juju/model/grantrevoke.go
	new file:   cmd/juju/model/grantrevoke_test.go
	deleted:    cmd/juju/model/share.go
	deleted:    cmd/juju/model/share_test.go
	deleted:    cmd/juju/model/unshare.go
	deleted:    cmd/juju/model/unshare_test.go
	modified:   cmd/juju/service/bundle.go
	modified:   cmd/juju/service/bundle_test.go
	modified:   cmd/juju/service/deploy.go
	modified:   cmd/juju/service/deploy_test.go
	modified:   cmd/juju/status/output_tabular.go
	modified:   cmd/juju/status/status_test.go
	modified:   cmd/juju/user/add.go
	modified:   cmd/juju/user/add_test.go
	modified:   cmd/jujud/agent/machine.go
	modified:   cmd/jujud/agent/machine/manifolds.go
	modified:   cmd/jujud/agent/machine_test.go
	modified:   cmd/jujud/agent/testing/agent.go
	modified:   cmd/jujud/agent/unit.go
	modified:   cmd/jujud/agent/unit_test.go
	modified:   cmd/jujud/bootstrap.go
	modified:   cmd/jujud/bootstrap_test.go
	modified:   cmd/jujud/reboot/reboot.go
	modified:   cmd/jujud/reboot/reboot_nix_test.go
	modified:   cmd/jujud/reboot/reboot_test.go
	modified:   cmd/jujud/upgrade_mongo_test.go
	modified:   cmd/modelcmd/controller.go
	modified:   cmd/plugins/juju-metadata/toolsmetadata_test.go
	modified:   cmd/plugins/juju-metadata/validatetoolsmetadata.go
	modified:   cmd/plugins/juju-metadata/validatetoolsmetadata_test.go
	modified:   cmd/supercommand.go
	modified:   constraints/constraints.go
	modified:   constraints/constraints_test.go
	modified:   constraints/validation_test.go
	modified:   container/kvm/live_test.go
	modified:   container/lxc/lxc.go
	modified:   container/lxd/lxd.go
	modified:   container/testing/common.go
	modified:   dependencies.tsv
	modified:   environs/bootstrap/bootstrap.go
	modified:   environs/bootstrap/bootstrap_test.go
	modified:   environs/bootstrap/tools.go
	modified:   environs/bootstrap/tools_test.go
	modified:   environs/config/config.go
	modified:   environs/config/config_test.go
	modified:   environs/instances/instancetype.go
	modified:   environs/instances/instancetype_test.go
	modified:   environs/jujutest/livetests.go
	modified:   environs/jujutest/tests.go
	modified:   environs/manual/provisioner_test.go
	modified:   environs/open_test.go
	modified:   environs/sync/sync.go
	modified:   environs/sync/sync_test.go
	modified:   environs/testing/credentials.go
	modified:   environs/testing/tools.go
	modified:   environs/tools/build.go
	modified:   environs/tools/simplestreams.go
	modified:   environs/tools/simplestreams_test.go
	modified:   environs/tools/storage.go
	modified:   environs/tools/storage_test.go
	modified:   environs/tools/testing/testing.go
	modified:   environs/tools/tools.go
	modified:   environs/tools/tools_test.go
	modified:   environs/tools/validation.go
	modified:   featuretests/api_model_test.go
	modified:   featuretests/cmd_juju_model_test.go
	modified:   featuretests/cmd_juju_user_test.go
	modified:   featuretests/upgrade_test.go
	modified:   juju/api_test.go
	new file:   juju/permission/model.go
	new file:   juju/permission/model_test.go
	new file:   juju/permission/package_test.go
	modified:   juju/testing/conn.go
	modified:   jujuclient/credentials_test.go
	modified:   jujuclient/file.go
	modified:   provider/azure/environ.go
	modified:   provider/azure/environ_test.go
	modified:   provider/cloudsigma/client_test.go
	modified:   provider/cloudsigma/environ_test.go
	modified:   provider/cloudsigma/environcaps.go
	modified:   provider/cloudsigma/environinstance_test.go
	modified:   provider/common/bootstrap.go
	modified:   provider/common/bootstrap_test.go
	modified:   provider/common/destroy_test.go
	modified:   provider/dummy/environs.go
	modified:   provider/dummy/environs_test.go
	modified:   provider/ec2/ebs_test.go
	modified:   provider/ec2/environ.go
	modified:   provider/ec2/live_test.go
	modified:   provider/ec2/local_test.go
	modified:   provider/gce/environ_policy.go
	modified:   provider/gce/environ_policy_test.go
	modified:   provider/gce/testing_test.go
	modified:   provider/interfaces.go
	modified:   provider/joyent/credentials.go
	modified:   provider/joyent/credentials_test.go
	modified:   provider/joyent/environ_instance.go
	modified:   provider/joyent/local_test.go
	modified:   provider/lxd/environ_broker.go
	modified:   provider/lxd/environ_policy.go
	modified:   provider/lxd/environ_policy_test.go
	modified:   provider/lxd/environ_raw.go
	modified:   provider/lxd/testing_test.go
	modified:   provider/maas/constraints.go
	modified:   provider/maas/environ_whitebox_test.go
	modified:   provider/maas/maas_test.go
	modified:   provider/manual/environ.go
	modified:   provider/manual/environ_test.go
	modified:   provider/openstack/config.go
	modified:   provider/openstack/credentials.go
	modified:   provider/openstack/credentials_test.go
	modified:   provider/openstack/local_test.go
	modified:   provider/openstack/provider.go
	modified:   provider/openstack/upgrade.go
	modified:   provider/rackspace/environ_test.go
	modified:   provider/vsphere/environ_broker_test.go
	modified:   provider/vsphere/environ_policy.go
	modified:   provider/vsphere/environ_policy_test.go
	modified:   scripts/build-release-tarball/build-release-tarball.bash
	modified:   service/discovery_test.go
	modified:   service/testing_test.go
	modified:   state/allcollections.go
	modified:   state/allwatcher.go
	modified:   state/allwatcher_internal_test.go
	modified:   state/backups/archive.go
	modified:   state/backups/db.go
	modified:   state/backups/db_restore_test.go
	modified:   state/backups/metadata.go
	modified:   state/backups/metadata_test.go
	modified:   state/backups/restore_test.go
	modified:   state/backups/storage.go
	new file:   state/binarystorage.go
	renamed:    state/toolstorage/tools.go -> state/binarystorage/binarystorage.go
	renamed:    state/toolstorage/tools_test.go -> state/binarystorage/binarystorage_test.go
	new file:   state/binarystorage/interface.go
	renamed:    state/tools_test.go -> state/binarystorage_test.go
	deleted:    state/compat_test.go
	modified:   state/export_test.go
	modified:   state/interface.go
	modified:   state/machine.go
	modified:   state/machine_test.go
	modified:   state/model.go
	modified:   state/modeluser.go
	modified:   state/modeluser_test.go
	modified:   state/multiwatcher/multiwatcher.go
	modified:   state/open.go
	modified:   state/state.go
	modified:   state/state_test.go
	modified:   state/testing/agent.go
	deleted:    state/tools.go
	deleted:    state/toolstorage/interface.go
	modified:   state/unit.go
	modified:   state/unit_test.go
	modified:   state/upgrade.go
	modified:   state/upgrade_test.go
	modified:   state/user.go
	modified:   state/user_internal_test.go
	modified:   state/user_test.go
	modified:   testcharms/charm-repo/quantal/dummy/metadata.yaml
	new file:   testcharms/charm-repo/quantal/minjujuversion/metadata.yaml
	new file:   testcharms/charm-repo/quantal/minjujuversion/revision
	modified:   testing/environ.go
	modified:   testing/factory/factory.go
	modified:   tools/list.go
	modified:   tools/list_test.go
	modified:   tools/lxdclient/client_image.go
	modified:   tools/marshal.go
	modified:   tools/marshal_test.go
	modified:   tools/tools.go
	modified:   upgrades/operations.go
	modified:   upgrades/providerchanges.go
	modified:   upgrades/steps126.go
	modified:   upgrades/steps126_test.go
	modified:   upgrades/upgrade.go
	modified:   upgrades/upgrade_test.go
	modified:   version/current_test.go
	modified:   version/package_test.go
	modified:   version/version.go
	modified:   version/version_test.go
	modified:   worker/deployer/simple.go
	modified:   worker/deployer/simple_test.go
	modified:   worker/provisioner/container_initialisation_test.go
	modified:   worker/provisioner/kvm-broker_test.go
	modified:   worker/provisioner/lxc-broker_test.go
	modified:   worker/provisioner/provisioner_task.go
	modified:   worker/provisioner/provisioner_test.go
	modified:   worker/uniter/runner/jujuc/tools_test.go
	modified:   worker/upgrader/error.go
	modified:   worker/upgrader/manifold.go
	modified:   worker/upgrader/upgrader.go
	modified:   worker/upgrader/upgrader_test.go
	modified:   worker/upgradesteps/worker.go
	modified:   worker/upgradesteps/worker_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   worker/provisioner/lxc-broker.go
Download as text