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:08 UTC

[05/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/09e596ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/09e596ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/09e596ba

Branch: refs/heads/master
Commit: 09e596baba1b81c8491fee608a5aff1075ab621a
Parents: 29fe93a 800ceea
Author: Barbara Gomes <ba...@gmail.com>
Authored: Tue Nov 29 14:44:29 2016 -0800
Committer: Barbara Gomes <ba...@gmail.com>
Committed: Tue Nov 29 14:44:29 2016 -0800

----------------------------------------------------------------------
 .../src/main/scala/org/apache/iota/fey/FeyGenericActor.scala     | 2 +-
 fey-core/src/main/scala/org/apache/iota/fey/Monitor.scala        | 2 +-
 fey-core/src/main/scala/org/apache/iota/fey/TrieNode.scala       | 4 ++--
 fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------