brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [4/4] git commit: Merge pull request #1438 from sjcorbett/jsgui-more-ha
Date Mon, 02 Jun 2014 11:25:20 GMT
Merge pull request #1438 from sjcorbett/jsgui-more-ha

More HA info in the jsgui

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/17ee8c77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/17ee8c77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/17ee8c77

Branch: refs/heads/master
Commit: 17ee8c7790861f5f6f00e3fcb7c7239f9a04604e
Parents: 64d3fec e84e78f
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Jun 2 12:16:36 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Jun 2 12:16:36 2014 +0100

----------------------------------------------------------------------
 usage/jsgui/src/main/webapp/assets/css/base.css |  1 -
 .../jsgui/src/main/webapp/assets/js/model/ha.js | 11 ++++++++++
 usage/jsgui/src/main/webapp/assets/js/router.js | 14 +++++++++++-
 .../main/webapp/assets/js/view/ha-summary.js    |  5 ++++-
 .../assets/tpl/home/server-not-ha-master.html   |  5 +++++
 .../src/test/javascript/specs/model/ha-spec.js  | 23 ++++++++++++++++++++
 .../rest/domain/HighAvailabilitySummary.java    |  7 ++++++
 .../src/test/resources/fixtures/ha-summary.json |  7 ++++++
 .../transform/HighAvailabilityTransformer.java  |  2 +-
 9 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



Mime
View raw message