← Back to branch summary

~axwalk/juju-core/lp1303195-manual-ubuntuuser-bash

~axwalk/juju-core/lp1303195-manual-ubuntuuser-bash

Viewing all changes in revision 2317.1.1.

Committer: Ian Booth
Date: 2014-02-13 05:22:01 UTC
mfrom: (2319 juju-core)
mto: This revision was merged to the branch mainline in revision 2324.
Revision ID: ian.booth@canonical.com-20140213052201-028ej5b6cis8dk3y

Merge upstream, add new code

Show diffs side-by-side

added added

removed removed

agent/format-1.16.go

agent/format-1.16_whitebox_test.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

log/syslog/config_test.go

log/syslog/testing/

log/syslog/testing/syslogconf.go

upgrades/export_test.go

upgrades/file.go

upgrades/file_test.go

upgrades/lockdirectory118.go

upgrades/lockdirectory118_test.go

upgrades/operations.go

upgrades/rsyslogconf118.go

upgrades/rsyslogconf118_test.go

upgrades/steps118.go

upgrades/steps118_test.go

upgrades/upgrade.go

upgrades/upgrade_test.go

worker/machineenvironmentworker/machineenvironmentworker.go

worker/machineenvironmentworker/machineenvironmentworker_test.go

Older »