helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [2/2] git commit: Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x
Date Wed, 25 Jun 2014 22:27:12 GMT
Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/05440cbe
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/05440cbe
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/05440cbe

Branch: refs/heads/helix-0.6.x
Commit: 05440cbeae9ba49d3cb0fde3366279d7b5b12912
Parents: 991d1a3 0474ee0
Author: Kanak Biscuitwala <kanak@apache.org>
Authored: Wed Jun 25 15:26:55 2014 -0700
Committer: Kanak Biscuitwala <kanak@apache.org>
Committed: Wed Jun 25 15:26:55 2014 -0700

----------------------------------------------------------------------
 .gitignore                                         |  2 ++
 .../stages/ExternalViewComputeStage.java           |  5 ++++-
 .../monitoring/mbeans/ClusterStatusMonitor.java    | 15 ++++++++++++---
 .../helix/monitoring/mbeans/ResourceMonitor.java   | 17 ++++++++++++++++-
 .../monitoring/mbeans/ResourceMonitorMBean.java    |  2 ++
 .../monitoring/mbeans/TestResourceMonitor.java     |  7 +++----
 6 files changed, 39 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message