Unifield Web

Merge lp:~jr.allen/unifield-web/us2694 into lp:unifield-web

  1. us2694
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4841
Proposed branch: lp:~jr.allen/unifield-web/us2694
Merge into: lp:unifield-web
Diff against target: 15 lines (+0/-2)
1 file modified
openobject/commands.py (+0/-2)
To merge this branch: bzr merge lp:~jr.allen/unifield-web/us2694
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+321960@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openobject/commands.py'
2--- openobject/commands.py 2017-02-14 16:26:27 +0000
3+++ openobject/commands.py 2017-04-05 08:05:56 +0000
4@@ -154,8 +154,6 @@
5 return False
6
7 cmd = [ rbin, '-server', https_name, '-redir', str(redir_port) ]
8- if cherrypy.config.get('server.use_letsencrypt', False):
9- cmd.append('-usele')
10 proc = subprocess.Popen(cmd,
11 stderr=subprocess.STDOUT, # Merge stdout and stderr
12 stdout=subprocess.PIPE)
13
14=== modified file 'revprox/revprox.exe'
15Binary files revprox/revprox.exe 2017-03-02 10:59:48 +0000 and revprox/revprox.exe 2017-04-05 08:05:56 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: