Xiang Li 2c9d57a9fe fix conflicts 12 gadi atpakaļ
..
commands.go 2c9d57a9fe fix conflicts 12 gadi atpakaļ
fields.go 2c9d57a9fe fix conflicts 12 gadi atpakaļ
logger.go 784d286f37 merge from master 12 gadi atpakaļ
priority.go 2c9d57a9fe fix conflicts 12 gadi atpakaļ
sinks.go 784d286f37 merge from master 12 gadi atpakaļ