Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/appendix/guides/ubuntu.txt
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/settings.py

1 files changed, 10 insertions, 0 deletions

diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 5eef72350..787ed1d49 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -465,6 +465,16 @@ Bcfg2 client itself.""")
             ('Logging', self.setup['logging'])]
         print_tabular(output)
 
+    def do_expirecache(self, args):
+        """ expirecache [<hostname> [<hostname> ...]]- Expire the
+        metadata cache """
+        alist = args.split()
+        if len(alist):
+            for client in self._get_client_list(alist):
+                self.metadata_cache.expire(client)
+        else:
+            self.metadata_cache.expire()
+
     def do_probes(self, args):
         """probes [-p] <hostname>
         Get probe list for the given host, in XML (the default) \