tree 1fd6a184c96437f58e3d6c8b02926a8556b9a8ba
parent 26d5df390cf976dcc1d17fc68d0fed789dc34e84
parent 6a38d118d86b7907009bcec34f1b788d076f1d1c
author Kai Zheng <kai.zheng@intel.com> 1475980180 +0800
committer Kai Zheng <kai.zheng@intel.com> 1475980180 +0800

Merge branch 'trunk' into HADOOP-12756