Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-make-config-visible into lp:adt-cloud-worker

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-make-config-visible
Merge into: lp:adt-cloud-worker
Diff against target: 25 lines (+2/-2)
2 files modified
README.rst (+1/-1)
adt_cloud_worker/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-make-config-visible
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+253113@code.launchpad.net

Commit message

Don't make the config file hidden.

Description of the change

Don't make the config file hidden.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-03-16 03:20:46 +0000
3+++ README.rst 2015-03-16 20:51:34 +0000
4@@ -67,7 +67,7 @@
5 Run the Service
6 ===============
7
8-Creating/updating the sample configuration file in '.adt-service.conf'::
9+Creating/updating the sample configuration file in 'adt-service.conf'::
10
11 [adt]
12 name = foo
13
14=== renamed file '.adt-service.conf' => 'adt-service.conf'
15=== modified file 'adt_cloud_worker/__init__.py'
16--- adt_cloud_worker/__init__.py 2015-03-16 03:20:46 +0000
17+++ adt_cloud_worker/__init__.py 2015-03-16 20:51:34 +0000
18@@ -226,7 +226,7 @@
19
20 parser = argparse.ArgumentParser(
21 description='ADT cloud worker ...')
22- parser.add_argument('-c', '--conf', default='.adt-service.conf',
23+ parser.add_argument('-c', '--conf', default='adt-service.conf',
24 help='Configuration file path')
25 args = parser.parse_args()
26

Subscribers

People subscribed via source and target branches

to all changes: