Merge branch 'master-3.1-backport' into v3.1.0
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/528423a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/528423a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/528423a8 Branch: refs/heads/master Commit: 528423a8330ab62115b2b7250aada3a55cd0d20f Parents: 3c0076a 6d0fde6 Author: thomas <[email protected]> Authored: Tue Aug 4 21:51:12 2015 -0700 Committer: thomas <[email protected]> Committed: Tue Aug 4 21:51:12 2015 -0700 ---------------------------------------------------------------------- api/src/main/java/com/datatorrent/api/AutoMetric.java | 11 +++++------ .../com/datatorrent/stram/engine/StreamingContainer.java | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/528423a8/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java ----------------------------------------------------------------------
