From patchwork Wed Jul 13 18:51:22 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Zygmunt Krynicki
X-Patchwork-Id: 2684
Return-Path:
X-Original-To: patchwork@peony.canonical.com
Delivered-To: patchwork@peony.canonical.com
Received: from fiordland.canonical.com (fiordland.canonical.com
[91.189.94.145])
by peony.canonical.com (Postfix) with ESMTP id 2B6ED24354
for ;
Wed, 13 Jul 2011 18:51:54 +0000 (UTC)
Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com
[209.85.216.180])
by fiordland.canonical.com (Postfix) with ESMTP id E3D01A18788
for ;
Wed, 13 Jul 2011 18:51:53 +0000 (UTC)
Received: by mail-qy0-f180.google.com with SMTP id 30so4268369qyk.11
for ;
Wed, 13 Jul 2011 11:51:53 -0700 (PDT)
Received: by 10.229.217.3 with SMTP id hk3mr1432612qcb.38.1310583113608;
Wed, 13 Jul 2011 11:51:53 -0700 (PDT)
X-Forwarded-To: linaro-patchwork@canonical.com
X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com
Delivered-To: patches@linaro.org
Received: by 10.229.217.78 with SMTP id hl14cs30732qcb;
Wed, 13 Jul 2011 11:51:52 -0700 (PDT)
Received: by 10.227.178.135 with SMTP id bm7mr1281268wbb.52.1310583111702;
Wed, 13 Jul 2011 11:51:51 -0700 (PDT)
Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139])
by mx.google.com with ESMTP id
en14si30711950wbb.41.2011.07.13.11.51.51;
Wed, 13 Jul 2011 11:51:51 -0700 (PDT)
Received-SPF: pass (google.com: best guess record for domain of
bounces@canonical.com designates 91.189.90.139 as permitted
sender) client-ip=91.189.90.139;
Authentication-Results: mx.google.com;
spf=pass (google.com: best guess record for domain
of bounces@canonical.com designates 91.189.90.139 as
permitted sender) smtp.mail=bounces@canonical.com
Received: from loganberry.canonical.com ([91.189.90.37])
by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian))
id 1Qh4XF-0001eO-Rb
for ; Wed, 13 Jul 2011 18:51:49 +0000
Received: from loganberry.canonical.com (localhost [127.0.0.1])
by loganberry.canonical.com (Postfix) with ESMTP id 6CA5E2F72D4
for ; Wed, 13 Jul 2011 18:51:22 +0000 (UTC)
MIME-Version: 1.0
X-Launchpad-Project: lava-server
X-Launchpad-Branch: ~linaro-validation/lava-server/trunk
X-Launchpad-Message-Rationale: Subscriber
X-Launchpad-Branch-Revision-Number: 208
X-Launchpad-Notification-Type: branch-revision
To: Linaro Patch Tracker
From: noreply@launchpad.net
Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 208: Merge 0.3b4
changes (fixes to API pages)
Message-Id: <20110713185122.26569.24259.launchpad@loganberry.canonical.com>
Date: Wed, 13 Jul 2011 18:51:22 -0000
Reply-To: noreply@launchpad.net
Sender: bounces@canonical.com
Errors-To: bounces@canonical.com
Precedence: bulk
X-Generated-By: Launchpad (canonical.com); Revision="13405";
Instance="initZopeless config overlay"
X-Launchpad-Hash: 7abb2098dbdbd0afdc754c25859426cfcdab6c38
Merge authors:
Zygmunt Krynicki (zkrynicki)
Related merge proposals:
https://code.launchpad.net/~linaro-validation/lava-server/0.3b4/+merge/67876
proposed by: Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 208 [merge]
committer: Zygmunt Krynicki
branch nick: trunk
timestamp: Wed 2011-07-13 20:49:36 +0200
message:
Merge 0.3b4 changes (fixes to API pages)
modified:
lava_server/__init__.py
lava_server/templates/linaro_django_xmlrpc/_base.html
lava_server/templates/linaro_django_xmlrpc/api.html
---
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk
You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
=== modified file 'lava_server/__init__.py'
--- lava_server/__init__.py 2011-07-12 15:09:34 +0000
+++ lava_server/__init__.py 2011-07-13 18:28:51 +0000
@@ -17,4 +17,4 @@
# along with LAVA Server. If not, see .
-__version__ = (0, 3, 0, "beta", 3)
+__version__ = (0, 3, 0, "beta", 4)
=== modified file 'lava_server/templates/linaro_django_xmlrpc/_base.html'
--- lava_server/templates/linaro_django_xmlrpc/_base.html 2011-07-13 12:48:44 +0000
+++ lava_server/templates/linaro_django_xmlrpc/_base.html 2011-07-13 18:25:34 +0000
@@ -10,7 +10,7 @@
{% block extension_navigation %}
@@ -19,5 +19,5 @@
{% block breadcrumbs %}
{{ block.super }}
-{% trans "API Help" %}
+{% trans "API Help" %}
{% endblock %}
=== modified file 'lava_server/templates/linaro_django_xmlrpc/api.html'
--- lava_server/templates/linaro_django_xmlrpc/api.html 2011-07-13 10:24:49 +0000
+++ lava_server/templates/linaro_django_xmlrpc/api.html 2011-07-13 18:27:25 +0000
@@ -17,8 +17,8 @@
client. For example, in python you can do this:
import xmlrpclib
-server = xmlrpclib.ServerProxy("{{ site_url }}{% url linaro_django_xmlrpc.views.handler %}")
-print server.version()
+server = xmlrpclib.ServerProxy("{{ site_url }}{% url lava.api_handler %}")
+print server.system.listMethods()
Available functions