diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
commit | bdcbded3236fa76f011c8d594c4b261c8b816199 (patch) | |
tree | 23d9886731ccbf52e8f3d3d9ccc0cfeb8dbb273a /src/lib/Bcfg2/Server/Plugins/Bundler.py | |
parent | 864bce0515b85f206381ac033875b12d06a2540d (diff) | |
parent | 5c9cd24767bcbc8cdb39eebf2fd81e9c814c01af (diff) | |
download | bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.gz bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.bz2 bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.zip |
Merge branch 'maint'
Conflicts:
doc/client/tools/actions.txt
schemas/authorizedkeys.xsd
src/lib/Bcfg2/Client/Frame.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Bundler.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index f91bac634..b3824fb57 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -52,15 +52,12 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.XMLDirectoryBacked.__init__(self, self.data) #: Bundles by bundle name, rather than filename self.bundles = dict() - __init__.__doc__ = Bcfg2.Server.Plugin.Plugin.__init__.__doc__ def HandleEvent(self, event): Bcfg2.Server.Plugin.XMLDirectoryBacked.HandleEvent(self, event) self.bundles = dict([(b.bundle_name, b) for b in self.entries.values()]) - HandleEvent.__doc__ = \ - Bcfg2.Server.Plugin.XMLDirectoryBacked.HandleEvent.__doc__ def BuildStructures(self, metadata): bundleset = [] @@ -121,5 +118,3 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, data.remove(child) bundleset.append(data) return bundleset - BuildStructures.__doc__ = \ - Bcfg2.Server.Plugin.Structure.BuildStructures.__doc__ |