Snappy

Merge lp:~mvo/snappy/15.04-fix-typo into lp:~snappy-dev/snappy/15.04-deprecated

  1. 15.04-fix-typo
  2. Merge into 15.04-deprecated
Proposed by Michael Vogt
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 471
Merged at revision: 472
Proposed branch: lp:~mvo/snappy/15.04-fix-typo
Merge into: lp:~snappy-dev/snappy/15.04-deprecated
Diff against target: 25 lines (+2/-2)
2 files modified
snappy/click_test.go (+1/-1)
systemd/systemd.go (+1/-1)
To merge this branch: bzr merge lp:~mvo/snappy/15.04-fix-typo
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+270491@code.launchpad.net

Commit message

Fix typo (USer -> User)

Description of the change

Tiny branch with a silly typo fix

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy/click_test.go'
2--- snappy/click_test.go 2015-09-08 06:47:10 +0000
3+++ snappy/click_test.go 2015-09-09 08:00:32 +0000
4@@ -1549,7 +1549,7 @@
5 [Socket]
6 ListenStream=/var/run/docker.sock
7 SocketMode=0660
8-SocketUSer=root
9+SocketUser=root
10 SocketGroup=adm
11
12 [Install]
13
14=== modified file 'systemd/systemd.go'
15--- systemd/systemd.go 2015-09-08 06:47:10 +0000
16+++ systemd/systemd.go 2015-09-09 08:00:32 +0000
17@@ -261,7 +261,7 @@
18 [Socket]
19 ListenStream={{.ListenStream}}
20 {{if .SocketMode}}SocketMode={{.SocketMode}}{{end}}
21-{{if .SocketUser}}SocketUSer={{.SocketUser}}{{end}}
22+{{if .SocketUser}}SocketUser={{.SocketUser}}{{end}}
23 {{if .SocketGroup}}SocketGroup={{.SocketGroup}}{{end}}
24
25 [Install]

Subscribers

People subscribed via source and target branches