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/04 16:47:08 UTC
[2/2] incubator-quarks git commit: Merge branch 'pr-66'
Merge branch 'pr-66'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/18f72269
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/18f72269
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/18f72269
Branch: refs/heads/master
Commit: 18f7226999255e393f5240cd5d0e066cf0b42b77
Parents: 4f44d31 e5652ce
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Mon Apr 4 07:40:47 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Mon Apr 4 07:40:47 2016 -0700
----------------------------------------------------------------------
.../execution/services/ControlService.java | 31 ++++++++----------
.../java/quarks/apps/runtime/MonitorApp.java | 13 ++++----
.../runtime/jmxcontrol/JMXControlService.java | 34 +++++++++++++-------
.../runtime/jsoncontrol/JsonControlService.java | 16 ++++++---
4 files changed, 53 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/18f72269/apps/runtime/src/main/java/quarks/apps/runtime/MonitorApp.java
----------------------------------------------------------------------