diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-15 14:54:25 -0500 |
| commit | a47ee22ab684eed992128b60b136fca90ff9f119 (patch) | |
| tree | cd55daf8057049368b4aaa6d23c30408eae411d2 /MANIFEST.in | |
| parent | 70bfc8f5a3150d09cc064a4c46efcaff80b29904 (diff) | |
| parent | a7d67f35019af0c25f133c979112fc6035d7e04c (diff) | |
| download | third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.gz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.xz third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.zip | |
Merge branch 'devel'
Merging devel work on 0.7.X/0.8 release with master
Conflicts:
CHANGELOG
cobbler.spec
cobbler/action_import.py
cobbler/utils.py
cobbler/webui/master.py
setup.py
Diffstat (limited to 'MANIFEST.in')
| -rw-r--r-- | MANIFEST.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 7375351..357cdcc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,10 +8,8 @@ include config/cobblerd_rotate include config/cobbler_hosts include config/modules.conf include config/auth.conf -include config/webui-cherrypy.cfg include config/settings -include config/.htaccess -include config/.htpasswd +include config/users.digest recursive-include templates *.template recursive-include kickstarts *.ks include docs/cobbler.1.gz @@ -19,10 +17,14 @@ include docs/cobbler.html include docs/wui.html include COPYING AUTHORS README CHANGELOG include scripts/watcher.py +include scripts/index.py include scripts/cobblerd include scripts/findks.cgi include scripts/nopxe.cgi include scripts/webui.cgi +include scripts/gateway.py +include scripts/post_install_trigger.cgi +include scripts/cobbler_auth_help include snippets/* recursive-include po *.pot recursive-include po *.po |