Merge branch 'devel-3' of https://github.com/apache/incubator-apex-core into feature-module
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/b85de3d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b85de3d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b85de3d7 Branch: refs/heads/feature-module Commit: b85de3d7b73b1219a1243b152cfdfc8ae62a188d Parents: 013ccbee b3863b2 Author: Vlad Rozov <[email protected]> Authored: Mon Nov 9 08:32:11 2015 -0800 Committer: Vlad Rozov <[email protected]> Committed: Mon Nov 9 08:32:11 2015 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/api/AutoMetric.java | 2 +- .../main/java/com/datatorrent/api/Operator.java | 2 +- checkstyle-suppressions.xml | 28 +++ engine/pom.xml | 2 +- .../datatorrent/stram/engine/GenericNode.java | 6 +- .../java/com/datatorrent/stram/engine/Node.java | 33 ++- .../stram/engine/StreamingContainer.java | 250 +++++++++---------- .../stram/webapp/LogicalOperatorInfo.java | 1 - .../stram/engine/GenericNodeTest.java | 85 +++++++ pom.xml | 2 + 10 files changed, 270 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
