tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Set tcp = tor only if txtorcon is imported #392

Closed
david415 wants to merge 2 commits from 2860.fix_i2p_create_node.0 into master
pull from: 2860.fix_i2p_create_node.0
merge into: tahoe-lafs:master
Conversation 3 Commits 2 Files Changed 2 +16 -1
david415 commented 2017-01-09 16:26:03 +00:00 (Migrated from github.com)
Copy Link

for i2p this means tcp = none as long as txtorcon is not imported

for i2p this means tcp = none as long as txtorcon is not imported
codecov-io commented 2017-01-09 18:08:48 +00:00 (Migrated from github.com)
Copy Link

Current coverage is 89.83% (diff: 33.33%)

Merging #392 into master will increase coverage by 0.01%

@@             master       #392   diff @@
==========================================
  Files           137        137          
  Lines         26862      26864     +2   
  Methods           0          0          
  Messages          0          0          
  Branches       3733       3734     +1   
==========================================
+ Hits          24128      24134     +6   
+ Misses         2032       2028     -4   
  Partials        702        702

Powered by Codecov. Last update 8913ebf...a73b12c

## [Current coverage](https://codecov.io/gh/tahoe-lafs/tahoe-lafs/pull/392?src=pr) is 89.83% (diff: 33.33%) > Merging [#392](https://codecov.io/gh/tahoe-lafs/tahoe-lafs/pull/392?src=pr) into [master](https://codecov.io/gh/tahoe-lafs/tahoe-lafs/branch/master?src=pr) will increase coverage by **0.01%** ```diff @@ master #392 diff @@ ========================================== Files 137 137 Lines 26862 26864 +2 Methods 0 0 Messages 0 0 Branches 3733 3734 +1 ========================================== + Hits 24128 24134 +6 + Misses 2032 2028 -4 Partials 702 702 ``` > Powered by [Codecov](https://codecov.io?src=pr). Last update [8913ebf...a73b12c](https://codecov.io/gh/tahoe-lafs/tahoe-lafs/compare/8913ebfaf764affbf224b737bbbc691de10c19ae...a73b12c9b4dde0db933f582523e8201508987ef4?src=pr)
warner commented 2017-01-10 20:34:19 +00:00 (Migrated from github.com)
Copy Link

I've got a patch that adds a test and also fixes the syntax (it turns out that we need tcp = disabled instead of tcp = none). I'll push it to your branch, see if that works.

I've got a patch that adds a test and also fixes the syntax (it turns out that we need `tcp = disabled` instead of `tcp = none`). I'll push it to your branch, see if that works.
warner commented 2017-01-11 00:34:55 +00:00 (Migrated from github.com)
Copy Link

Looks good, rebasing and landing now.

Looks good, rebasing and landing now.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Benchmarking and Performance

   
HTTP Storage Protocol

   
Nevow Removal

   
Python 3 Porting

   
not-for-merge
No Label
Benchmarking and Performance
HTTP Storage Protocol
Nevow Removal
Python 3 Porting
not-for-merge
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: tahoe-lafs/tahoe-lafs#392
No description provided.
Delete Branch "2860.fix_i2p_create_node.0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?