← Back to branch summary

~wwitzel3/juju-core/009-ha-rsyslog-api

~wwitzel3/juju-core/009-ha-rsyslog-api

Viewing all changes in revision 2750.

Committer: Wayne Witzel III
Date: 2014-05-22 14:33:11 UTC
mfrom: (2729.20.20 juju-core)
Revision ID: wayne.witzel@canonical.com-20140522143311-2j47pd5lsrvls91s

merge trunk

files removed:
thirdparty

thirdparty/pbkdf2

thirdparty/pbkdf2/pbkdf2.go

thirdparty/pbkdf2/pbkdf2_test.go

files modified:
agent/mongo/upgrade_test.go

charm/config_test.go

charm/repo_test.go

charm/url.go

charm/url_test.go

cmd/juju/adduser.go

cmd/juju/adduser_test.go

cmd/juju/bootstrap_test.go

cmd/juju/removeuser_test.go

cmd/juju/upgradejuju_test.go

cmd/package_test.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

cmd/supercommand.go

cmd/supercommand_test.go

constraints/validation.go

constraints/validation_test.go

dependencies.tsv

environs/bootstrap/bootstrap_test.go

environs/sync/sync_test.go

environs/tools/build.go

environs/tools/simplestreams_test.go

environs/tools/testing/testing.go

environs/tools/tools_test.go

names/user.go

names/user_test.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/common/export_test.go

provider/common/mock_test.go

provider/common/polling_test.go

provider/common/state.go

provider/common/state_test.go

provider/local/environ_test.go

provider/maas/environ_whitebox_test.go

provider/manual/environ_test.go

provider/manual/provider.go

provider/openstack/local_test.go

replicaset/replicaset_test.go

state/api/usermanager/client.go

state/apiserver/client/client_test.go

state/apiserver/client/status.go

state/apiserver/tools_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/cleanup.go

state/cleanup_test.go

state/environ.go

state/machine.go

state/machine_test.go

state/relation.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/state.go

state/state_test.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

state/watcher.go

store/store_test.go

testing/mgo.go

utils/fslock/package_test.go

utils/password.go

version/version.go

version/version_test.go

worker/simpleworker.go

Show diffs side-by-side

added added

removed removed

agent/mongo/upgrade_test.go

charm/config_test.go

charm/repo_test.go

charm/url_test.go

cmd/juju/adduser.go

cmd/juju/adduser_test.go

cmd/juju/bootstrap_test.go

cmd/juju/removeuser_test.go

cmd/juju/upgradejuju_test.go

cmd/package_test.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

cmd/supercommand.go

cmd/supercommand_test.go

constraints/validation.go

constraints/validation_test.go

dependencies.tsv

environs/bootstrap/bootstrap_test.go

environs/sync/sync_test.go

environs/tools/build.go

environs/tools/simplestreams_test.go

environs/tools/testing/testing.go

environs/tools/tools_test.go

names/user_test.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/common/export_test.go

provider/common/mock_test.go

provider/common/polling_test.go

provider/common/state.go

provider/common/state_test.go

provider/local/environ_test.go

provider/maas/environ_whitebox_test.go

provider/manual/environ_test.go

provider/manual/provider.go

provider/openstack/local_test.go

replicaset/replicaset_test.go

state/api/usermanager/client.go

state/apiserver/client/client_test.go

state/apiserver/client/status.go

state/apiserver/tools_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/cleanup.go

state/cleanup_test.go

state/environ.go

state/machine.go

state/machine_test.go

state/relation.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/state_test.go

state/unit_test.go

state/user_test.go

state/watcher.go

store/store_test.go

thirdparty/pbkdf2/

thirdparty/pbkdf2/pbkdf2.go

thirdparty/pbkdf2/pbkdf2_test.go

utils/fslock/package_test.go

utils/password.go

version/version.go

version/version_test.go

worker/simpleworker.go

Older »