You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2016/01/10 18:58:17 UTC

[2/2] incubator-apex-core git commit: Merge branch 'APEXCORE-268' of https://github.com/chandnisingh/incubator-apex-core into APEXCORE-268

Merge branch 'APEXCORE-268' of https://github.com/chandnisingh/incubator-apex-core into APEXCORE-268


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/aded30c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/aded30c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/aded30c4

Branch: refs/heads/devel-3
Commit: aded30c45cc7bd2dba08243c5d0536fe9fe13bb1
Parents: b14583c 778436f
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sun Jan 10 09:52:05 2016 -0800
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sun Jan 10 09:52:05 2016 -0800

----------------------------------------------------------------------
 common/pom.xml                                  |  2 +-
 .../common/codec/JsonStreamCodec.java           | 13 +++--
 .../common/experimental/AppData.java            | 14 ++++--
 .../common/metric/MetricsAggregator.java        | 12 ++---
 .../common/metric/SingleMetricAggregator.java   |  1 +
 .../partitioner/StatelessPartitioner.java       | 51 +++++++++-----------
 .../auth/callback/DefaultCallbackHandler.java   | 10 ++--
 .../common/util/AsyncFSStorageAgent.java        | 20 ++++++--
 .../datatorrent/common/util/BaseOperator.java   |  2 -
 .../util/BasicContainerOptConfigurator.java     | 22 ++++-----
 .../datatorrent/common/util/FSStorageAgent.java | 42 ++++++++--------
 .../util/JacksonObjectMapperProvider.java       |  6 ++-
 .../common/util/NameableThreadFactory.java      |  4 +-
 .../datatorrent/common/util/PubSubMessage.java  |  3 +-
 .../common/util/PubSubMessageCodec.java         |  9 ++--
 .../common/util/PubSubWebSocketClient.java      | 50 ++++++++++---------
 .../common/util/SerializableObject.java         | 41 ++++------------
 .../common/codec/JsonStreamCodecTest.java       |  4 +-
 .../partitioner/StatelessPartitionerTest.java   | 14 ++++--
 .../common/util/AsyncFSStorageAgentTest.java    | 13 ++---
 .../common/util/FSStorageAgentTest.java         | 19 ++++----
 .../common/util/SerializableObjectTest.java     |  5 +-
 22 files changed, 180 insertions(+), 177 deletions(-)
----------------------------------------------------------------------