Merge branch 'release-0.15' into develop

snf-astakos-app/astakos/im/static/im/css/forms.css

@@ -151,7 +151,12 @@ form.link-like.alone input[type="submit"]		{ padding:0; }
 .projects .minimal select						{ padding:3px; width:250px; }
 .projects .minimal label						{ position:absolute; right:290px; top:5px; white-space:nowrap}
 
+form.contactform label 							{ display: block; margin-bottom: 1em; float:none;}
+form.contactform textarea 						{ width: 406px; height:177px; max-width: 406px; max-height: 177px;}
+form.contactform input[type="submit"] 			{ margin:15px 0 0;}
+
 @media screen and (max-width : 630px) 		{ 
+    form.contactform textarea                   { width:90%;}
 	form.withlabels .extra-img	   				{ left:260px; }
     form.withlabels span.info 	   				{ left:260px; }
     form .extra-img	               				{ left:260px; }
@@ -191,6 +196,7 @@ form.link-like.alone input[type="submit"]		{ padding:0; }
     form.withlabels input[type="text"], 
     form.withlabels input[type="password"],
     form.withlabels textarea,
+    form.contactform textarea,
     form textarea, 
 	form input.text, 
 	form input[type="text"], 
@@ -222,4 +228,4 @@ form .refresh.open p:hover span.extra-img:hover		{ background-position: -33px -5
 
 
 form.withlabels.upperlabels label 					{ text-transform: uppercase;}
-form.withlabels.upperlabels textarea				{ margin-top:10px;}
\ No newline at end of file
+form.withlabels.upperlabels textarea				{ margin-top:10px;}

snf-astakos-app/astakos/im/templates/im/feedback.html

@@ -11,7 +11,7 @@ If you would like to contact us for any reason, please feel free to
 write <br>your message in the following form. Feedback and suggestions are<br>
 also highly appreciated.</p>
 <form action="{% url feedback %}" method="post"
-    class="withlabels">{% csrf_token %}
+    class="withlabels contactform">{% csrf_token %}
     
     {% with feedback_form as form %}
     {% include "im/form_render.html" %}

snf-pithos-app/pithos/api/test/__init__.py

@@ -59,6 +59,7 @@ from django.db.backends.creation import TEST_DATABASE_PREFIX
 import django.utils.simplejson as json
 
 
+import sys
 import random
 import functools
 
@@ -151,8 +152,11 @@ class PithosTestSuiteRunner(DjangoTestSuiteRunner):
     def teardown_databases(self, old_config, **kwargs):
         from pithos.api.util import _pithos_backend_pool
         _pithos_backend_pool.shutdown()
-        super(PithosTestSuiteRunner, self).teardown_databases(old_config,
-                                                              **kwargs)
+        try:
+            super(PithosTestSuiteRunner, self).teardown_databases(old_config,
+                                                                  **kwargs)
+        except Exception as e:
+            sys.stderr.write("FAILED to teardown databases: %s\n" % str(e))
 
 
 class PithosTestClient(Client):

snf-tools/synnefo_tools/burnin/cyclades_common.py

@@ -568,6 +568,12 @@ class CycladesTests(BurninTests):
     def _delete_floating_ips(self, fips):
         """Delete floating ips"""
         for fip in fips:
+            port_id = fip['port_id']
+            if port_id:
+                self.info("Destroying port with id %s", port_id)
+                self.clients.network.delete_port(port_id)
+                self._insist_on_port_deletion(port_id)
+
             self.info("Destroying floating IP %s with id %s",
                       fip['floating_ip_address'], fip['id'])
             self.clients.network.delete_floatingip(fip['id'])