Merge lp:~james-w/pkgme-service/nondev-config into lp:pkgme-service
|Approved by:||James Westby on 2012-05-03|
|Merged at revision:||88|
|Diff against target:||88 lines (+13/-11) 5 files modified|
|To merge this branch:||bzr merge lp:~james-w/pkgme-service/nondev-config|
Description of the Change
Steve found that calling the files for non-dev environments "production" was confusing,
as it's also the name of one specific deployment.
This changes the files to be "nondev" and updates references.
There's also a drive-by to remove the optional and discouraged "instance_id" argument
for the oops datedir repo in the dev config.