haidy 3c114e7cd9 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # client/control.go # client/service.go		2018-12-13 22:44:09 +08:00
..
control/shutdown	vendor: update shutdown	2018-05-08 23:51:13 +08:00
crypto	use dep instead of glide	2018-05-08 02:40:11 +08:00
errors	use dep instead of glide	2018-05-08 02:40:11 +08:00
io	vendor: add package io	2018-05-08 23:42:04 +08:00
msg/json	update vendor, fix #788	2018-05-21 21:09:18 +08:00
net	Merge remote-tracking branch 'upstream/master'	2018-12-13 22:44:09 +08:00
pool	use dep instead of glide	2018-05-08 02:40:11 +08:00
LICENSE	use dep instead of glide	2018-05-08 02:40:11 +08:00