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/07/11 18:50:37 UTC

[7/8] incubator-iota git commit: Merge branch 'MONITOR_EVENTS' of https://github.com/barbaragomes/incubator-iota

Merge branch 'MONITOR_EVENTS' of https://github.com/barbaragomes/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/e94ffe7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/e94ffe7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/e94ffe7f

Branch: refs/heads/master
Commit: e94ffe7f1d1d7c9101178d442b4fadbfa0c6f240
Parents: 36d489b 4cda6c7
Author: tonyfaustini <to...@yahoo.com>
Authored: Mon Jul 11 11:49:47 2016 -0700
Committer: tonyfaustini <to...@yahoo.com>
Committed: Mon Jul 11 11:49:47 2016 -0700

----------------------------------------------------------------------
 fey-core/src/main/resources/eventsTable.html    |  35 ++++++
 fey-core/src/main/resources/logback.xml         |  94 +++++---------
 .../scala/org/apache/iota/fey/Application.scala |  11 +-
 .../scala/org/apache/iota/fey/DirWatcher.scala  |   7 ++
 .../scala/org/apache/iota/fey/Ensemble.scala    |   8 ++
 .../scala/org/apache/iota/fey/FeyCore.scala     |   9 ++
 .../org/apache/iota/fey/FeyGenericActor.scala   |  17 +++
 .../org/apache/iota/fey/IdentifyFeyActors.scala |   2 +-
 .../scala/org/apache/iota/fey/Monitor.scala     | 121 +++++++++++++++++++
 .../scala/org/apache/iota/fey/MyService.scala   |  23 +++-
 .../org/apache/iota/fey/Orchestration.scala     |   4 +
 .../scala/org/apache/iota/fey/TrieNode.scala    |  46 +++++--
 .../main/scala/org/apache/iota/fey/Utils.scala  |   6 +
 13 files changed, 306 insertions(+), 77 deletions(-)
----------------------------------------------------------------------