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/013ccbee Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/013ccbee Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/013ccbee Branch: refs/heads/feature-module Commit: 013ccbeee54879aea9cb0eda1e76642a17ee3c54 Parents: 4ce1b36 b4b7c07 Author: Vlad Rozov <[email protected]> Authored: Mon Nov 2 07:48:03 2015 -0800 Committer: Vlad Rozov <[email protected]> Committed: Mon Nov 2 07:48:03 2015 -0800 ---------------------------------------------------------------------- .idea/codeStyleSettings.xml | 6 ++- CHANGELOG.md | 44 ++++++++++++++++++- apex_checks.xml | 1 + api/pom.xml | 6 +-- .../com/datatorrent/api/DefaultInputPort.java | 9 ++++ .../com/datatorrent/api/annotation/Name.java | 5 +++ bufferserver/pom.xml | 2 +- .../datatorrent/bufferserver/server/Server.java | 24 ++-------- .../datatorrent/bufferserver/util/VarInt.java | 5 +++ common/pom.xml | 8 ++-- .../common/metric/SingleMetricAggregator.java | 5 +++ .../common/metric/sum/DoubleSumAggregator.java | 5 +++ .../common/metric/sum/LongSumAggregator.java | 5 +++ engine/pom.xml | 2 +- .../datatorrent/stram/api/AppDataSource.java | 5 +++ .../java/com/datatorrent/stram/cli/DTCli.java | 2 +- .../com/datatorrent/stram/engine/Slider.java | 5 +++ .../plan/logical/DefaultKryoStreamCodec.java | 2 + .../StreamCodecWrapperForPersistance.java | 6 ++- .../PartitionAwareSinkForPersistence.java | 6 ++- .../datatorrent/stram/webapp/ContainerInfo.java | 5 +++ .../stram/webapp/asm/CompactAnnotationNode.java | 5 +++ .../stram/webapp/asm/CompactFieldNode.java | 5 +++ .../stram/webapp/asm/FieldSignatureVisitor.java | 5 +++ .../stram/client/AppPackageTest.java | 2 +- .../resources/testAppPackage/mydtapp/pom.xml | 22 +--------- misc/ide-templates/intellij/apex-style.jar | Bin 1515 -> 1459 bytes pom.xml | 20 +++------ 28 files changed, 145 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
