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/29fe93a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/29fe93a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/29fe93a0 Branch: refs/heads/master Commit: 29fe93a0400007f151a58c250a807424aa542636 Parents: 7830ba3 e96b066 Author: Barbara Gomes <barbaramaltago...@gmail.com> Authored: Mon Nov 21 10:38:14 2016 -0800 Committer: Barbara Gomes <barbaramaltago...@gmail.com> Committed: Mon Nov 21 10:38:14 2016 -0800 ---------------------------------------------------------------------- .../scala/org/apache/iota/fey/Ensemble.scala | 14 ++--- .../org/apache/iota/fey/FeyGenericActor.scala | 14 ++--- .../scala/org/apache/iota/fey/Monitor.scala | 10 ++-- .../scala/org/apache/iota/fey/TrieNode.scala | 60 ++++++++++---------- 4 files changed, 50 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
