From patchwork Wed Jan 18 09:00:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 6277 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 0387E23F83 for ; Wed, 18 Jan 2012 09:00:25 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id DA304A180A0 for ; Wed, 18 Jan 2012 09:00:24 +0000 (UTC) Received: by bkbzt4 with SMTP id zt4so2747865bkb.11 for ; Wed, 18 Jan 2012 01:00:24 -0800 (PST) Received: by 10.204.41.143 with SMTP id o15mr8285123bke.63.1326877224564; Wed, 18 Jan 2012 01:00:24 -0800 (PST) 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.205.82.144 with SMTP id ac16cs141115bkc; Wed, 18 Jan 2012 01:00:24 -0800 (PST) Received: by 10.180.101.161 with SMTP id fh1mr24116377wib.0.1326877222829; Wed, 18 Jan 2012 01:00:22 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id w81si6257581weq.143.2012.01.18.01.00.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 Jan 2012 01:00:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RnRNW-0001s8-EO for ; Wed, 18 Jan 2012 09:00:22 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 62630E043A for ; Wed, 18 Jan 2012 09:00: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: 340 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 340: Merged lp:~zkrynicki/lava-server/fix-915314 Message-Id: <20120118090022.15578.68521.launchpad@ackee.canonical.com> Date: Wed, 18 Jan 2012 09:00: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="14681"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7552ce24e16955bdc55bd8c0758c463309b12fd2 Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-server/fix-915314/+merge/88367 proposed by: Zygmunt Krynicki (zkrynicki) review: Approve - Spring Zhang (qzhang) ------------------------------------------------------------ revno: 340 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Wed 2012-01-18 09:57:16 +0100 message: Merged lp:~zkrynicki/lava-server/fix-915314 modified: lava_server/settings/common.py --- 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/settings/common.py' --- lava_server/settings/common.py 2012-01-12 12:39:35 +0000 +++ lava_server/settings/common.py 2012-01-18 08:57:16 +0000 @@ -87,7 +87,7 @@ # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = MOUNT_POINT + "static/admin/" +ADMIN_MEDIA_PREFIX = MOUNT_POINT + "/static/admin/" # The true outer url is /lava-server/ LOGIN_REDIRECT_URL = MOUNT_POINT + "/"