[prev in list] [next in list] [prev in thread] [next in thread] 

List:       luci-commits
Subject:    [Luci-commits] [luci: 3/6] Merge branch 'master' of ssh://git.fedorahosted.org/git/luci
From:       rmccabe () fedoraproject ! org (rmccabe)
Date:       2010-09-23 20:56:24
Message-ID: 20100923205624.A30C7120339 () lists ! fedorahosted ! org
[Download RAW message or body]

commit f5bca162537e332bd6e81e3e8d44193b9830abb4
Merge: 2fcb477... adb8569...
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Mon Aug 23 11:02:40 2010 -0400

    Merge branch 'master' of ssh://git.fedorahosted.org/git/luci

 luci.spec                                |    4 +-
 luci/controllers/cluster.py              |   94 +++++++++++++++++++++--
 luci/controllers/root.py                 |    8 ++-
 luci/lib/ClusterConf/Cluster.py          |   28 ++++++-
 luci/lib/ClusterConf/Device.py           |    8 ++
 luci/lib/ClusterConf/ModelBuilder.py     |    2 +
 luci/lib/ClusterConf/TagObject.py        |   17 ++++-
 luci/lib/ClusterConf/Unfence.py          |   15 ++++
 luci/lib/app_strings.py                  |   38 +++++-----
 luci/lib/flash2.py                       |  119 ++++++++++++++++++++++++++++++
 luci/public/css/node.css                 |   10 +++
 luci/public/css/style.css                |   44 +++++++----
 luci/templates/configure.html            |   25 ++++---
 luci/templates/fence_instances.html      |  117 ++++++++++++++++++++---------
 luci/templates/master.html               |   15 +++-
 luci/templates/node.html                 |   38 ++++++++--
 luci/widget_validators/validate_fence.py |   38 ++++++++--
 lucipam/lucipam.c                        |    2 +-
 18 files changed, 505 insertions(+), 117 deletions(-)
---

[prev in list] [next in list] [prev in thread] [next in thread]