New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

normalize proxy properties #1650

Merged
merged 2 commits into from Oct 10, 2016

Conversation

Projects
None yet
2 participants
@msimerson
Member

msimerson commented Oct 9, 2016

Do the same for proxy properties as #1098 did for the rest of the connection properties.

Changes proposed in this pull request:

  • c.haproxy_ip -> c.proxy.ip
  • c.proxy -> c.proxy.allowed
  • c.proxy_time -> c.proxy.timer
  • new property: c.proxy.type (null, haproxy, someFutureProxy)

Checklist:

  • docs updated
  • tests updated

@msimerson msimerson referenced this pull request Oct 10, 2016

Merged

connection.remote.is_private #1648

2 of 2 tasks complete
@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Oct 10, 2016

Current coverage is 34.53% (diff: 25.00%)

Merging #1650 into master will decrease coverage by 0.01%

@@             master      #1650   diff @@
==========================================
  Files            25         25          
  Lines          6385       6388     +3   
  Methods         825        825          
  Messages          0          0          
  Branches       1665       1668     +3   
==========================================
  Hits           2206       2206          
- Misses         4179       4182     +3   
  Partials          0          0          

Powered by Codecov. Last update 57288f7...f4a91bc

Current coverage is 34.53% (diff: 25.00%)

Merging #1650 into master will decrease coverage by 0.01%

@@             master      #1650   diff @@
==========================================
  Files            25         25          
  Lines          6385       6388     +3   
  Methods         825        825          
  Messages          0          0          
  Branches       1665       1668     +3   
==========================================
  Hits           2206       2206          
- Misses         4179       4182     +3   
  Partials          0          0          

Powered by Codecov. Last update 57288f7...f4a91bc

@msimerson msimerson merged commit b3ce582 into haraka:master Oct 10, 2016

1 of 3 checks passed

codecov/patch 25.00% of diff hit (target 34.54%)
Details
codecov/project 34.53% (-0.02%) compared to 57288f7
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@msimerson msimerson deleted the msimerson:normalize-proxy-settings branch Oct 10, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment