tree b6d5f111a692c677ff6970b349e029a82b4f2101
parent 38282872b7da5e353a0bf47619e7302d5d0c9fa7
parent 708456f0405e5e21d9b0b28bbef2fb386b3f214e
author plusplusjiajia <jiajia.li@intel.com> 1467773863 +0800
committer plusplusjiajia <jiajia.li@intel.com> 1467773863 +0800

Merge remote-tracking branch 'asf/trunk' into kadmin-remote