Merge branch 'APEXCORE-267' of https://github.com/chandnisingh/incubator-apex-core 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/3b6c252f Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/3b6c252f Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/3b6c252f Branch: refs/heads/master Commit: 3b6c252fe2a1855a6044b122a69fbb6f9376a1fe Parents: aded30c 9da2e85 Author: Vlad Rozov <[email protected]> Authored: Mon Jan 11 08:35:15 2016 -0800 Committer: Vlad Rozov <[email protected]> Committed: Mon Jan 11 08:35:15 2016 -0800 ---------------------------------------------------------------------- api/pom.xml | 2 +- .../java/com/datatorrent/api/Attribute.java | 20 +++++++------------- .../java/com/datatorrent/api/AutoMetric.java | 6 +++++- .../java/com/datatorrent/api/Component.java | 2 +- .../main/java/com/datatorrent/api/Context.java | 9 +++++++-- api/src/main/java/com/datatorrent/api/DAG.java | 3 ++- .../com/datatorrent/api/DefaultInputPort.java | 3 +-- .../com/datatorrent/api/DefaultOutputPort.java | 4 ++-- .../com/datatorrent/api/DefaultPartition.java | 19 +++++++++---------- .../java/com/datatorrent/api/LocalMode.java | 8 ++++---- .../java/com/datatorrent/api/Partitioner.java | 4 ++-- .../main/java/com/datatorrent/api/Stats.java | 1 + .../java/com/datatorrent/api/StatsListener.java | 13 ++++++++++++- .../datatorrent/api/StreamingApplication.java | 2 +- .../java/com/datatorrent/api/StringCodec.java | 14 ++++++-------- .../api/annotation/ApplicationAnnotation.java | 3 ++- .../annotation/InputPortFieldAnnotation.java | 6 +++++- .../com/datatorrent/api/annotation/Name.java | 6 +++++- .../annotation/OutputPortFieldAnnotation.java | 5 ++--- .../datatorrent/api/annotation/RecordField.java | 6 +++++- .../datatorrent/api/annotation/Stateless.java | 6 +++++- .../com/datatorrent/api/AttributeMapTest.java | 8 ++++---- .../com/datatorrent/api/Object2StringTest.java | 13 +++++++------ 23 files changed, 96 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
