Merge remote-tracking branch 'upstream/job-service' into sync_image

This commit is contained in:
Wenkai Yin 2016-06-07 13:48:10 +08:00
commit f91d2f1eba

Diff Content Not Available