You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iota.apache.org by to...@apache.org on 2017/01/31 22:29:05 UTC
[02/12] incubator-iota git commit: Merge branch 'IOTA-29' of
https://github.com/shiv4nsh/incubator-iota
Merge branch 'IOTA-29' of https://github.com/shiv4nsh/incubator-iota
Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/d212cda1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/d212cda1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/d212cda1
Branch: refs/heads/master
Commit: d212cda1dbc6cab4150d5f0edbf5f824d9428c98
Parents: d6c98cf d4a151a
Author: Barbara Gomes <ba...@gmail.com>
Authored: Mon Nov 14 11:04:20 2016 -0800
Committer: Barbara Gomes <ba...@gmail.com>
Committed: Mon Nov 14 11:04:20 2016 -0800
----------------------------------------------------------------------
fey-core/src/main/resources/application.conf | 1 -
.../scala/org/apache/iota/fey/Application.scala | 1 -
.../apache/iota/fey/CheckpointProcessor.scala | 1 -
.../scala/org/apache/iota/fey/Ensemble.scala | 27 +-
.../scala/org/apache/iota/fey/FeyCore.scala | 17 +-
.../org/apache/iota/fey/FeyGenericActor.scala | 14 +-
.../iota/fey/FeyGenericActorReceiver.scala | 3 +-
.../org/apache/iota/fey/FeyUIService.scala | 3 +-
.../org/apache/iota/fey/JsonReceiver.scala | 3 +-
.../org/apache/iota/fey/JsonReceiverActor.scala | 1 -
.../scala/org/apache/iota/fey/Monitor.scala | 8 +-
.../org/apache/iota/fey/Orchestration.scala | 4 +-
.../scala/org/apache/iota/fey/TrieNode.scala | 20 +-
.../main/scala/org/apache/iota/fey/Utils.scala | 9 +-
.../apache/iota/fey/WatchServiceReceiver.scala | 1 -
.../apache/iota/fey/performer/Application.scala | 22 +-
.../apache/iota/fey/performer/Heartbeat.scala | 33 +--
.../iota/fey/performer/RandomDouble.scala | 33 +--
.../iota/fey/performer/RandomInteger.scala | 33 +--
.../apache/iota/fey/performer/RandomUUID.scala | 33 +--
.../apache/iota/fey/performer/Timestamp.scala | 33 +--
.../org/apache/iota/fey/performer/Sensor.scala | 54 ++--
.../apache/iota/fey/performer/Application.scala | 2 +-
.../iota/fey/performer/ZMQPublisher.scala | 40 +--
.../iota/fey/performer/ZMQSubscriber.scala | 29 +--
scalastyle-config.xml | 249 ++++++++++---------
26 files changed, 354 insertions(+), 320 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/d212cda1/fey-core/src/main/resources/application.conf
----------------------------------------------------------------------