From 6f8a5711bb5bdbf993d56566acfeb6e2c3f582d9 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 16 Mar 2017 11:19:22 +0000
Subject: [PATCH] Switch nova and upper-constraints back to master branches.

Change-Id: If4d7d0a198c63ed1374a9273716f5a36ba3bef32
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index ad245bb0..43f8cef1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,14 +7,14 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    EVENTLET_NO_GREENDNS=yes
    PYTHONDONTWRITEBYTECODE=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -egit+https://github.com/openstack/nova.git@stable/ocata#egg=nova
+       -egit+https://github.com/openstack/nova.git#egg=nova
 commands = ostestr {posargs}
 
 [testenv:py27]