You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/04/05 17:57:20 UTC
[2/2] incubator-quarks git commit: Merge branch 'pr-73'
Merge branch 'pr-73'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/6ab4ad55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/6ab4ad55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/6ab4ad55
Branch: refs/heads/master
Commit: 6ab4ad553c286cb7794c0d37e096fa85716641f5
Parents: b6123f9 ef45d5e
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Tue Apr 5 08:46:04 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Tue Apr 5 08:46:04 2016 -0700
----------------------------------------------------------------------
.../mbeans/ApplicationServiceMXBean.java | 1 +
.../java/quarks/providers/iot/IotProvider.java | 54 ++++++++++----------
.../runtime/appservice/AppServiceControl.java | 2 +-
.../runtime/jsoncontrol/JsonControlService.java | 4 +-
4 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------