Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/8dd1b500 Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/8dd1b500 Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/8dd1b500 Branch: refs/heads/site Commit: 8dd1b500e67463148d7afbfd3318844dbe4d0fc7 Parents: f66dab5 1b6b42c Author: Terence Yim <[email protected]> Authored: Wed May 11 23:56:37 2016 -0700 Committer: Terence Yim <[email protected]> Committed: Wed May 11 23:56:37 2016 -0700 ---------------------------------------------------------------------- .../twill/internal/DefaultResourceReport.java | 2 +- .../twill/internal/logging/KafkaAppender.java | 4 ++-- .../twill/filesystem/FileContextLocation.java | 5 +++++ .../apache/twill/yarn/YarnTwillController.java | 19 ++++++++++--------- 4 files changed, 18 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
