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, 57 deletions

diff --git a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html
deleted file mode 100644
index 409d418fe..000000000
--- a/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends "base.html" %}
-
-{% block pagebanner %}
-  <div class="header">
-      <h2>Welcome to Hostbase!</h2>
-      <p>search for hosts using one or more of the fields below
-  </div>
-  <br/>
-{% endblock %}
-
-{% block sidebar %}
-<a href="/hostbase/new" class="sidebar">add a new host</a><br>
-<a href="/hostbase/zones" class="sidebar">zone file information</a><br>
-{% include "logout.tmpl" %}
-{% endblock %}
-
-{% block content %}
-{% comment %}
- ...or go to <a href="hostinfo">this</a>
- page to enter hostinfo-like queries<br><br>
-{% endcomment %}
-
-<form name="input" action="?sub=true" method="post">
-   <fieldset class="module aligned ()">
-   <label for="hostname">hostname:</label><input name="hostname" type="text" ><br>
-   <label for="netgroup">netgroup:</label><input name="netgroup" type="text" ><br>
-   <label for="security_class">class:</label><input name="security_class" type="text" ><br>
-   <label for="support">support:</label><input name="support" type="text" ><br>
-   <label for="csi">csi:</label><input name="csi" type="text" ><br>
-   <label for="printq">printq:</label><input name="printq" type="text" ><br>
-   <label for="outbound_smtp">outbound_smtp:</label>
-   {% for choice in yesno %}
-   <input type="radio" name="outbound_smtp" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}<br>
-   <label for="primary_user">primary_user:</label><input name="primary_user" type="text" ><br>
-   <label for="administrator">administrator:</label><input name="administrator" type="text" ><br>
-   <label for="location">location:</label><input name="location" type="text" ><br>
-   <label for="expiration_date">expiration_date:</label><input name="expiration_date" type="text" ><br>
-   <br><label for="Interface">Interface:</label>
-   {% for choice in TYPE_CHOICES %}
-   <input type="radio" name="hdwr_type" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}<br>
-   <label for="dhcp">dhcp:</label>
-   {% for choice in yesno %}
-   <input type="radio" name="dhcp" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}<br>
-   <label for="mac_addr">mac_addr:</label><input name="mac_addr" type="text" ><br>
-   <label for="ip_addr">ip_addr:</label><input name="ip_addr" type="text" ><br>
-   <label for="dns_view">dns_viewer:</label>
-   {% for choice in DNS_CHOICES %}
-   <input type="radio" name="dns_view" value="{{ choice.0 }}" >{{ choice.1 }}
-   {% endfor %}<br>
-   <label for="mx">mx:</label><input name="mx" type="text" ><br>
-<p>
-<input type="submit" value="Search">
-</form>
-{% endblock %}