Merge branch 'trunk' into HADOOP-12111
Conflicts:
dev-support/test-patch.sh
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/942def2d
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/942def2d
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/942def2d
Branch: refs/heads/master
Commit: 942def2dc5e28b9b4c434a1e7763386e153654bc
Parents: d32053a 8369b1c
Author: Allen Wittenauer <[email protected]>
Authored: Thu Aug 13 12:52:23 2015 -0700
Committer: Allen Wittenauer <[email protected]>
Committed: Thu Aug 13 12:52:23 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
