Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/34ee0b9b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/34ee0b9b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/34ee0b9b Branch: refs/heads/trunk Commit: 34ee0b9b4797093f5aeb0d55f32cf1b74b02e1c2 Parents: 8e1bdc1 4672315 Author: Ming Ma <[email protected]> Authored: Mon Jun 29 14:37:44 2015 -0700 Committer: Ming Ma <[email protected]> Committed: Mon Jun 29 14:37:44 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../api/records/impl/pb/SerializedExceptionPBImpl.java | 2 +- .../records/impl/pb/TestSerializedExceptionPBImpl.java | 12 ++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
