Wenkai Yin b6e27f6ea2 Merge remote-tracking branch 'upstream/configuration' into 161228_config
Conflicts:
	tests/docker-compose.test.yml
2017-01-19 17:56:53 +08:00
..
2016-11-09 17:37:58 +08:00
2017-01-06 15:41:07 +08:00
2016-10-21 18:39:10 +08:00
2016-10-21 18:39:10 +08:00
2017-01-19 17:56:08 +08:00
2017-01-19 17:56:08 +08:00
2016-06-07 12:19:48 +08:00