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 2016/11/29 23:29:30 UTC

[31/31] 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/2895047d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/2895047d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/2895047d

Branch: refs/heads/master
Commit: 2895047d1d341ad5ba299f0c228ce56825781f34
Parents: a027f11 800ceea
Author: tonyfaustini <to...@yahoo.com>
Authored: Tue Nov 29 15:28:40 2016 -0800
Committer: tonyfaustini <to...@yahoo.com>
Committed: Tue Nov 29 15:28:40 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    |  39 +--
 .../scala/org/apache/iota/fey/FeyCore.scala     |  17 +-
 .../org/apache/iota/fey/FeyGenericActor.scala   |  24 +-
 .../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     |  14 +-
 .../org/apache/iota/fey/Orchestration.scala     |   4 +-
 .../scala/org/apache/iota/fey/TrieNode.scala    |  68 ++---
 .../main/scala/org/apache/iota/fey/Utils.scala  |   9 +-
 .../apache/iota/fey/WatchServiceReceiver.scala  |   1 -
 .../scala/org/apache/iota/fey/MonitorSpec.scala |   2 +-
 .../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 ++++++++++---------
 27 files changed, 394 insertions(+), 358 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/2895047d/fey-core/src/main/resources/application.conf
----------------------------------------------------------------------