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/10/19 18:44:07 UTC
[8/8] incubator-iota git commit: Merge branch 'IOTA-23' of
https://github.com/shiv4nsh/incubator-iota
Merge branch 'IOTA-23' 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/e08e775e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/e08e775e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/e08e775e
Branch: refs/heads/master
Commit: e08e775e59a7735fc83347a8208a3c3d7e600fe2
Parents: 76cf461 b746c38
Author: tonyfaustini <to...@yahoo.com>
Authored: Wed Oct 19 11:42:55 2016 -0700
Committer: tonyfaustini <to...@yahoo.com>
Committed: Wed Oct 19 11:42:55 2016 -0700
----------------------------------------------------------------------
fey-core/src/main/resources/application.conf | 10 ++-
.../scala/org/apache/iota/fey/Application.scala | 13 +--
.../org/apache/iota/fey/FeyUIService.scala | 78 +++++++++++++++++
.../scala/org/apache/iota/fey/MyService.scala | 88 --------------------
.../main/scala/org/apache/iota/fey/Utils.scala | 7 +-
project/Build.scala | 2 +-
project/Dependencies.scala | 1 +
7 files changed, 94 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/e08e775e/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/e08e775e/project/Build.scala
----------------------------------------------------------------------