tree 6ddeb45b567c58900e99160694977a8babb6aff6
parent fe33f181e665729dac9fe7923378d9e1a47d1237
parent 5eef1bf82e08134cd85d916a208bf51450ac2b2a
author Tim Armstrong <tarmstrong@cloudera.com> 1482450249 -0800
committer Tim Armstrong <tarmstrong@cloudera.com> 1482450298 -0800

Merge remote-tracking branch 'origin/master' into hadoop-next

Change-Id: Ib37056d1f273f6efb5b87c9b48512f8b14ab497b