9 commits

Author	SHA1	Message	Date
Christopher Franko	a85150f0b4	upstream merge continued	2017-03-26 12:08:39 -04:00
Christopher Franko	5822644626	Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9	2017-03-26 11:40:56 -04:00
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.	2017-03-22 20:49:15 +01:00
Péter Szilágyi	e7030c4bf5	all: update light logs (and a few others) to the new model	2017-03-03 11:41:52 +02:00
Péter Szilágyi	d4fd06c3dc	all: blidly swap out glog to our log15, logs need rework	2017-02-23 12:16:44 +02:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
Zsolt Felfoldi	f12f8a6c14	les, light: add block availability check for ODR requests	2016-12-10 09:53:25 +01:00
Felix Lange	b8bd9a71c8	all: update license information	2016-11-09 02:51:34 +01:00
Zsolt Felfoldi	760fd65487	light: light chain, VM env and tx pool	2016-11-09 02:12:53 +01:00