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:32 UTC
[2/8] incubator-iota git commit: Merge branch 'master' of
github.com:apache/incubator-iota
Merge branch 'master' of github.com:apache/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/6c3e8cc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/6c3e8cc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/6c3e8cc0
Branch: refs/heads/master
Commit: 6c3e8cc006f83632add2bf24302aff86ac8dc946
Parents: 16a4579 3d38f1a
Author: Barbara Gomes <ba...@gmail.com>
Authored: Mon Jul 11 10:40:57 2016 -0700
Committer: Barbara Gomes <ba...@gmail.com>
Committed: Mon Jul 11 10:40:57 2016 -0700
----------------------------------------------------------------------
.gitignore | 2 +-
.../fey/FeyConfiguration/feyConfiguration | 4 +-
Performers/fey/FeyJSONRepo/raspberryPi.json | 368 -------------------
Performers/fey/FeyJSONRepo/test.json | 26 --
Performers/project/Build.scala | 57 ---
Performers/project/BuildSettings.scala | 55 ---
Performers/project/Dependencies.scala | 29 --
Performers/project/build.properties | 1 -
Performers/project/plugins.sbt | 5 -
fey-core/project/Build.scala | 109 ------
fey-core/project/build.properties | 17 -
fey-core/project/plugins.sbt | 22 --
performers/fey/FeyJSONRepo/timestamp.json | 27 ++
performers/fey/JSONSamples/raspberryPi.json | 368 +++++++++++++++++++
performers/fey/JSONSamples/temperature.json | 28 ++
.../src/main/resources/background_noise | 1 +
.../virtual_sensor/src/main/resources/door_slam | 1 +
.../virtual_sensor/src/main/resources/sound | 1 +
.../virtual_sensor/src/main/resources/vibration | 1 +
.../apache/iota/fey/performer/Application.scala | 23 ++
.../org/apache/iota/fey/performer/Sensor.scala | 172 +++++++++
project/Build.scala | 73 ++++
project/BuildSettings.scala | 93 +++++
project/Dependencies.scala | 44 +++
project/build.properties | 1 +
project/plugins.sbt | 6 +
26 files changed, 842 insertions(+), 692 deletions(-)
----------------------------------------------------------------------