Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 0 insertions, 71 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html
deleted file mode 100644
index fa12e3ec5..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{% extends "base.html" %}
-
-{% block pagebanner %}
-  <div class="header">
-      <h2>Zones</h2>
-      <p>Hostbase generates DNS zone files for the following zones.
-  </div>
-  <br/>
-{% endblock %}
-
-{% block sidebar %}
-{% include "navbar.tmpl" %}
-<ul class="sidebar">
-<li><a href="/hostbase/zones/{{ zone.id }}/edit/" class="sidebar">edit zone</a><br>
-</li>
-</ul>
-{% include "logout.tmpl" %}
-{% endblock %}
-
-{% block content %}
-<table border="0" width="100%">
-   <colgroup>
-   <col width="200">
-   <col width="*">
-   <tr> <td> <b>zone</b></td>
-   <td> {{ zone.zone }}</td></tr>
-   <tr> <td> <b>serial</b></td>
-   <td> {{ zone.serial }}</td></tr>
-   <tr> <td> <b>admin</b></td>
-   <td> {{ zone.admin }}</td></tr>
-   <tr> <td> <b>primary_master</b></td>
-   <td> {{ zone.primary_master }}</td></tr>
-   <tr> <td> <b>expire</b></td>
-   <td> {{ zone.expire }}</td></tr>
-   <tr> <td> <b>retry</b></td>
-   <td> {{ zone.retry }}</td></tr>
-   <tr> <td> <b>refresh</b></td>
-   <td> {{ zone.refresh }}</td></tr>
-   <tr> <td> <b>ttl</b></td>
-   <td> {{ zone.ttl }}</td></tr>
-
-   <tr><td valign="top"> <b>nameservers</b></td>
-   <td>
-   {% for nameserver in zone.nameservers.all %}
-   {{ nameserver.name }}<br>
-   {% endfor %}
-   </td></tr>
-   <tr><td valign="top"> <b>mxs</b></td>
-   <td>
-   {% for mx in zone.mxs.all %}
-   {{ mx.priority }} {{ mx.mx }}<br>
-   {% endfor %}
-   </td></tr>
-   {% if addresses %}
-   <tr><td valign="top"> <b>A records</b></td>
-   <td>
-   {% for address in sof.addresses.all %}
-   {{ address.ip_addr }}<br>
-   {% endfor %}
-   </td></tr>
-   {% endif %}
-
-   <tr> <td valign="top"> <b>aux</b></td>
-   <td>
-   {{ zone.aux|linebreaksbr }}
-   </td></tr>
-
-</table>
-<br><br>
-{% endblock %}
-