You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by ca...@apache.org on 2016/07/03 23:15:31 UTC

[3/3] incubator-quarks git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-quarks

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-quarks


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/91796df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/91796df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/91796df8

Branch: refs/heads/master
Commit: 91796df8a076932a3ffb8652c52b8eed3176f1d2
Parents: 1f03b3d 31cd665
Author: cazen <ca...@apache.org>
Authored: Sun Jul 3 23:15:15 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Sun Jul 3 23:15:15 2016 +0000

----------------------------------------------------------------------
 .../src/main/java/quarks/execution/Configs.java |   6 +-
 .../execution/services/ControlService.java      |  14 ++
 .../quarks/execution/services/Controls.java     |   9 +-
 .../java/quarks/topology/doc-files/sources.html |   7 +-
 .../quarks/topology/mbeans/package-info.java    |  48 +++----
 .../java/quarks/topology/tester/Tester.java     |   2 +-
 .../java/quarks/apps/runtime/JobMonitorApp.java |  47 ++++++-
 .../quarks/connectors/mqtt/iot/MqttDevice.java  |   2 +-
 .../java/quarks/providers/iot/package-info.java |  39 +++---
 quarks_overview.html                            |   3 +-
 .../java/quarks/runtime/etiao/EtiaoJob.java     |  20 ++-
 .../runtime/etiao/mbeans/EtiaoJobBean.java      | 133 ++++++++++++++++++-
 .../runtime/jmxcontrol/JMXControlService.java   |  27 +++-
 .../runtime/jsoncontrol/JsonControlService.java |  18 ++-
 .../apps/sensorAnalytics/package-info.java      |   2 +-
 .../quarks/test/fvt/iot/IotProviderTest.java    |  18 ++-
 .../quarks/streamscope/oplets/StreamScope.java  |   2 +-
 17 files changed, 314 insertions(+), 83 deletions(-)
----------------------------------------------------------------------