Merge branch 'APEX-28_pull_latest' into devel-3
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/454fecca Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/454fecca Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/454fecca Branch: refs/heads/feature-module Commit: 454feccacd280996624db339e6270bb0f20ebccc Parents: 7503dde 977093e Author: Chandni Singh <[email protected]> Authored: Wed Sep 16 21:52:27 2015 -0700 Committer: Chandni Singh <[email protected]> Committed: Wed Sep 16 21:52:27 2015 -0700 ---------------------------------------------------------------------- .../stram/plan/logical/LogicalPlan.java | 10 +- .../plan/logical/LogicalPlanConfiguration.java | 1305 ++++++++++++--- .../plan/LogicalPlanConfigurationTest.java | 876 ---------- .../datatorrent/stram/plan/LogicalPlanTest.java | 988 ------------ .../logical/LogicalPlanConfigurationTest.java | 1511 ++++++++++++++++++ .../stram/plan/logical/LogicalPlanTest.java | 988 ++++++++++++ .../stram/plan/logical/MockStorageAgent.java | 67 + .../src/test/resources/schemaTestTopology.json | 2 +- engine/src/test/resources/testTopology.json | 4 +- 9 files changed, 3639 insertions(+), 2112 deletions(-) ----------------------------------------------------------------------
