iota-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tonyfaust...@apache.org
Subject [3/3] incubator-iota git commit: Merge branch 'master' of github.com:apache/incubator-iota into IOTA-34
Date Tue, 31 Jan 2017 22:26:44 GMT
Merge branch 'master' of github.com:apache/incubator-iota into IOTA-34

# Conflicts:
#	fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala


Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/4775f990
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/4775f990
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/4775f990

Branch: refs/heads/master
Commit: 4775f9905bb0382e515978da31adac107ec7035a
Parents: 5a528b5 2895047
Author: Barbara Gomes <barbaramaltagomes@gmail.com>
Authored: Tue Nov 29 16:35:36 2016 -0800
Committer: Barbara Gomes <barbaramaltagomes@gmail.com>
Committed: Tue Nov 29 16:35:36 2016 -0800

----------------------------------------------------------------------
 Readme.md                                       |   6 +-
 fey-core/README.md                              |  20 +-
 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 ++++++++++---------
 29 files changed, 407 insertions(+), 371 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/4775f990/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
----------------------------------------------------------------------
diff --cc fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
index c3a7ac6,9c2b61d..0acedda
--- a/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala
@@@ -18,21 -17,19 +17,20 @@@
  
  package org.apache.iota.fey
  
- import java.nio.file.Paths
  import java.io.File
  
- import scala.concurrent.duration._
- import akka.actor.{Actor, ActorLogging, ActorRef, OneForOneStrategy, PoisonPill, Props,
Terminated}
- import Utils._
  import akka.actor.SupervisorStrategy._
- import play.api.libs.json._
- import JSON_PATH._
+ import akka.actor.{Actor, ActorLogging, ActorRef, OneForOneStrategy, PoisonPill, Props,
Terminated}
  import akka.routing.GetRoutees
- import org.apache.iota.fey.Orchestration.{CREATE_ENSEMBLES, DELETE_ENSEMBLES, UPDATE_ENSEMBLES}
  import com.eclipsesource.schema._
 +import org.apache.iota.fey.GlobalWatchService.REGISTER_WATCHER_PERFORMER
+ import org.apache.iota.fey.JSON_PATH._
+ import org.apache.iota.fey.Orchestration.{CREATE_ENSEMBLES, DELETE_ENSEMBLES, UPDATE_ENSEMBLES}
+ import org.apache.iota.fey.Utils._
+ import play.api.libs.json._
  
  import scala.collection.mutable.HashMap
+ import scala.concurrent.duration._
  
  protected class FeyCore extends Actor with ActorLogging{
  

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/4775f990/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
----------------------------------------------------------------------
diff --cc fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
index 83df62f,5114c95..2579958
--- a/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
@@@ -47,8 -44,9 +46,9 @@@ abstract class FeyGenericActor(val para
  
    extends Actor with ActorLogging{
  
+ 
    import FeyGenericActor._
 -
 +  import GlobalWatchService._
    /**
      * Keeps reference to the cancellable
      */


Mime
View raw message