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

diff --git a/examples/TGenshi/etc/motd/template.newtxt b/examples/TGenshi/etc/motd/template.newtxt
deleted file mode 100644
index ca3cc5f18..000000000
--- a/examples/TGenshi/etc/motd/template.newtxt
+++ /dev/null
@@ -1,31 +0,0 @@
-------------------------------------------------------------------------

-                    GOALS FOR SERVER MANAGED BY BCFG2

-------------------------------------------------------------------------

-Hostname is ${metadata.hostname}

-

-Groups:

-{% for group in metadata.groups %}\

- * ${group}

-{% end %}\

-

-{% if metadata.categories %}\

-Categories:

-{% for category in metadata.categories %}\

- * ${category}

-{% end %}\

-{% end %}\

-

-

-{% if metadata.Probes %}\

-Probes:

-{% for probe, value in metadata.Probes.iteritems() %}\

- * ${probe} \

-   ${value}

-{% end %}\

-{% end %}\

-

-------------------------------------------------------------------------

-                        ITOPS MOTD

-------------------------------------------------------------------------

-Please create a Ticket for any system level changes you need from IT.

-