Commit 2c8c3ebc authored by Christos Stavrakakis's avatar Christos Stavrakakis

Merge branch 'master' into develop

Conflicts:
	Changelog
	version
parents 9e180f78 8db60fe3
......@@ -69,6 +69,19 @@ objects by domain attribute. This is used by Plankton for listing VM images.
* Enforce container-level atomicity in (most) Pithos API calls.
.. _Changelog-0.14.7:
v0.14.7
=======
Released: Wed Sep 18 17:50:12 EEST 2013
Cyclades
--------
* Fix bug in helpdesk view
.. _Changelog-0.14.6:
v0.14.6
......
......@@ -5,6 +5,15 @@ Unified NEWS file for Synnefo versions >= 0.13
Since v0.13 all Synnefo components have been merged into a single repository.
.. _NEWS-0.14.7:
v0.14.7
=======
Released: Wed Sep 18 17:50:12 EEST 2013
* Bug fix version
.. _NEWS-0.14.6:
v0.14.6
......
......@@ -1838,13 +1838,14 @@ Upgrade Notes
v0.12 -> v0.13 <upgrade/upgrade-0.13>
v0.13 -> v0.14 <upgrade/upgrade-0.14>
v0.14 -> v0.14.2 <upgrade/upgrade-0.14.2>
v0.14.2 -> v0.14.6 <upgrade/upgrade-0.14.6>
v0.14.5 -> v0.14.6 <upgrade/upgrade-0.14.6>
Changelog, NEWS
===============
* v0.14.7 :ref:`Changelog <Changelog-0.14.6>`, :ref:`NEWS <NEWS-0.14.7>`
* v0.14.6 :ref:`Changelog <Changelog-0.14.6>`, :ref:`NEWS <NEWS-0.14.6>`
* v0.14.5 :ref:`Changelog <Changelog-0.14.5>`, :ref:`NEWS <NEWS-0.14.5>`
* v0.14.4 :ref:`Changelog <Changelog-0.14.4>`, :ref:`NEWS <NEWS-0.14.4>`
......
......@@ -185,7 +185,8 @@ def account(request, search_query):
if is_ip:
try:
nic = NetworkInterface.objects.get(ipv4=search_query).exclude(machine__deleted=True)
nic = NetworkInterface.objects.filter(ipv4=search_query).exclude(
machine__deleted=True).get()
search_query = nic.machine.userid
is_uuid = True
except NetworkInterface.DoesNotExist:
......
# This is a comment!
0.14.6next
0.14.7next
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment