tree e8011a98cf5cf0a158f4c7d924a2a85151b8d9dd
parent 08aafacd0d8066a5cc0dbeb462afc4ebf1bb493e
parent 7e2829662b4c4bf33ebaf2fa09312d0bed3d6f92
author Jing Zhao <jing9@apache.org> 1446584824 -0800
committer Jing Zhao <jing9@apache.org> 1446584824 -0800

Merge remote-tracking branch 'origin/trunk' into HDFS-8966