Merge branch 'APEXCORE-349' of https://github.com/davidyan74/incubator-apex-core
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/b81468c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b81468c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b81468c2 Branch: refs/heads/master Commit: b81468c2f08f14cd1139d890839ac66bf7fd6736 Parents: e5512a3 5790ea4 Author: Thomas Weise <[email protected]> Authored: Fri Feb 19 17:04:15 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Fri Feb 19 17:04:15 2016 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/api/StringCodec.java | 8 +++++++ .../metric/AutoMetricBuiltInTransport.java | 6 +++++ .../stram/StreamingContainerManager.java | 23 +++++++++----------- .../stram/plan/logical/LogicalPlan.java | 2 +- .../com/datatorrent/stram/webapp/AppInfo.java | 6 ++--- .../stram/webapp/StramWebServices.java | 23 ++++++++++++++------ .../stram/StreamingContainerManagerTest.java | 4 ++-- .../stram/support/StramTestSupport.java | 10 ++++----- .../stram/webapp/StramWebServicesTest.java | 19 +++++++++++++++- 9 files changed, 68 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b81468c2/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java ----------------------------------------------------------------------
