4 commits

Author	SHA1	Message	Date
Jack	71b989b29b	update from master ... resolve merge conflicts: lbrynet/core/client/BlobRequester.py lbrynet/core/Peer.py lbrynet/lbryfilemanager/EncryptedFileManager.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/Publisher.py	2016-09-29 23:34:59 -04:00
Jack	1720cce3b0	negotiated downloads ... -uploads are still underway	2016-09-27 13:52:44 -04:00
Job Evers-Meltzer	4334cdace1	Refactor blob requester to better seperate out the three requests ... Each blob requests has three parts - A request to see what blobs are available - A request to download and pay for one of those blobs - A request to negotiate data costs Before the refactoring all of the code to accomplish this was mixed into one class. They are now three seperate classes. There is still a lot of room for improvement, but it is at least better than it was.	2016-09-25 16:55:55 -07:00
Jimmy Kiselak	7240ff6b1c	initial commit	2015-08-20 11:27:15 -04:00