3 Commits (50c18e6eb818c26ff7b96c37a195686581783f6b)

Author	SHA1	Message	Date
Felix Lange	c213fd1fd8	all: import "context" instead of "golang.org/x/net/context" ... There is no need to depend on the old context package now that the minimum Go version is 1.7. The move to "context" eliminates our weird vendoring setup. Some vendored code still uses golang.org/x/net/context and it is now vendored in the normal way. This change triggered new vet checks around context.WithTimeout which didn't fire with golang.org/x/net/context.	8 years ago
Péter Szilágyi	d4fd06c3dc	all: blidly swap out glog to our log15, logs need rework	8 years ago
ΞTHΞЯSPHΞЯΞ	4d300e4dec	swarm: plan bee for content storage and distribution on web3 ... This change imports the Swarm protocol codebase. Compared to the 'swarm' branch, a few mostly cosmetic changes had to be made: * The various redundant log message prefixes are gone. * All files now have LGPLv3 license headers. * Minor code changes were needed to please go vet and make the tests pass on Windows. * Further changes were required to adapt to the go-ethereum develop branch and its new Go APIs. Some code has not (yet) been brought over: * swarm/cmd/bzzhash: will reappear as cmd/bzzhash later * swarm/cmd/bzzup.sh: will be reimplemented in cmd/bzzup * swarm/cmd/makegenesis: will reappear somehow * swarm/examples/album: will move to a separate repository * swarm/examples/filemanager: ditto * swarm/examples/files: will not be merged * swarm/test/*: will not be merged * swarm/services/swear: will reappear as contracts/swear when needed	8 years ago