Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF5A810BB3 for ; Fri, 7 Jun 2013 23:41:57 +0000 (UTC) Received: (qmail 43508 invoked by uid 500); 7 Jun 2013 23:41:57 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 43453 invoked by uid 500); 7 Jun 2013 23:41:57 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 43275 invoked by uid 99); 7 Jun 2013 23:41:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 23:41:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 75F618A097C; Fri, 7 Jun 2013 23:41:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Fri, 07 Jun 2013 23:42:15 -0000 Message-Id: In-Reply-To: <1ccbe82e88c14f838440761f0be101e9@git.apache.org> References: <1ccbe82e88c14f838440761f0be101e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/27] git commit: [#6314] Changed ShortURLs to be unique to the app instance instead of globally unique [#6314] Changed ShortURLs to be unique to the app instance instead of globally unique Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2b74a7de Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2b74a7de Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2b74a7de Branch: refs/heads/db/6276 Commit: 2b74a7de63284c6135803928bf9c3e168da9c6bb Parents: 445b640 Author: Cory Johns Authored: Wed Jun 5 16:27:38 2013 +0000 Committer: Cory Johns Committed: Thu Jun 6 18:00:15 2013 +0000 ---------------------------------------------------------------------- ForgeShortUrl/forgeshorturl/model/shorturl.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b74a7de/ForgeShortUrl/forgeshorturl/model/shorturl.py ---------------------------------------------------------------------- diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py index e765802..a16ef69 100644 --- a/ForgeShortUrl/forgeshorturl/model/shorturl.py +++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py @@ -27,7 +27,7 @@ class ShortUrl(M.Artifact): class __mongometa__: name = 'short_urls' - unique_indexes = ['short_name'] + unique_indexes = [('short_name', 'app_config_id')] type_s = 'ShortUrl' full_url = FieldProperty(str)