Merge "Don't change dashboard on admin tenant switch"

horizon/templates/horizon/common/_sidebar.html

@@ -22,7 +22,7 @@
           <li class='divider'></li>
           {% for tenant in authorized_tenants %}
             {% if tenant.enabled and tenant.id != request.user.tenant_id %}
-              <li><a href="{% url switch_tenants tenant.id %}">{{ tenant.name }}</a></li>
+              <li><a href="{% url switch_tenants tenant.id %}?next={{ request.horizon.dashboard.get_absolute_url }}">{{ tenant.name }}</a></li>
             {% endif %}
           {% endfor %}
         </ul>

run_tests.sh

@@ -6,7 +6,7 @@ set -o errexit
 # Increment me any time the environment should be rebuilt.
 # This includes dependncy changes, directory renames, etc.
 # Simple integer secuence: 1, 2, 3...
-environment_version=29
+environment_version=30
 #--------------------------------------------------------#
 
 function usage {

tools/pip-requires

@@ -1,7 +1,7 @@
 # Horizon Core Requirements
 Django>=1.4,<1.5
 django_compressor
-django_openstack_auth>=1.0.3
+django_openstack_auth>=1.0.7
 netaddr
 python-cinderclient
 python-glanceclient<2