diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:07:54 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:07:54 -0400 |
| commit | cb518895c64bfb690a1f3df0aaeeb147209493c3 (patch) | |
| tree | 91894e2a03bf7cd73360612ce6b936ebaea02999 | |
| parent | 134f6113711e8ced404ac24f66b5e4e6aa6c56d4 (diff) | |
| parent | 4538680d3bd8cb1803349a9281cfdfcc722e0449 (diff) | |
| download | third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.tar.gz third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.tar.xz third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.zip | |
Merge branch 'master' into devel
Conflicts:
CHANGELOG
cobbler.spec
setup.py
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | cobbler.spec | 7 | ||||
| -rw-r--r-- | cobbler/module_loader.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rw-r--r-- | docs/wui.html | 4 | ||||
| -rw-r--r-- | scripts/cobbler_auth_help | 2 |
6 files changed, 17 insertions, 6 deletions
@@ -5,6 +5,10 @@ Cobbler CHANGELOG - Make createrepo get run for local cobbler reposync invocations as needed - patch to allow yumopts to override gpgcheck +- ??? - 0.8.3 +- fix WebUI documentation URL +- fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z + * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page - disable local socket XMLRPC as nothing is using it. diff --git a/cobbler.spec b/cobbler.spec index 4b90755..aa61bd9 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -190,7 +190,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +<<<<<<< HEAD:cobbler.spec * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 +======= +* Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +- Upstream changes (see CHANGELOG) + +* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 +>>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Wed Feb 20 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.1-1 diff --git a/cobbler/module_loader.py b/cobbler/module_loader.py index aafe05f..b695a04 100644 --- a/cobbler/module_loader.py +++ b/cobbler/module_loader.py @@ -76,7 +76,7 @@ def get_module_by_name(name): def get_module_from_file(category,field,fallback_module_name=None): try: - value = cp.get("serializers",field) + value = cp.get(category,field) except: if fallback_module_name is not None: value = fallback_module_name diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 48f3442..b2abf09 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1204907251.215054 -__CHEETAH_genTimestamp__ = 'Fri Mar 7 11:27:31 2008' +__CHEETAH_genTime__ = 1205174715.425076 +__CHEETAH_genTimestamp__ = 'Mon Mar 10 14:45:15 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' diff --git a/docs/wui.html b/docs/wui.html index 38a1db7..c05a6f6 100644 --- a/docs/wui.html +++ b/docs/wui.html @@ -12,7 +12,7 @@ <div id="wrap"> <h1 id="masthead"> - <a href="/cgi-bin/cobbler/webui.cgi/index"> + <a href="/cobbler/web/"> <img alt="Cobbler Logo" src="/cobbler/webui/logo-cobbler.png"/> </a> @@ -70,7 +70,7 @@ variables are all the same. <br/> <br/> -Great. <A HREF="/cgi-bin/cobbler/webui.cgi">Let's start deploying.</A> +Great. <A HREF="/cobbler/web">Let's start deploying.</A> </div><!-- content --> diff --git a/scripts/cobbler_auth_help b/scripts/cobbler_auth_help index 8842d59..198e95b 100644 --- a/scripts/cobbler_auth_help +++ b/scripts/cobbler_auth_help @@ -30,7 +30,7 @@ my $method; my $username; my $realm; my $password; -my $verbose=0; +my $verbose=1; my $result = GetOptions( "method=s" => \$method, |