Merge branch 'api-current'

README.upgrade

@@ -4,6 +4,15 @@ README.Upgrade
 This file documents the upgrade to newer versions of the Synnefo software.
 For more information, please see README.deploy.
 
+v0.6.1 -> v0.6.2
+
+API-CURRENT
+    * The models were changed so that Flavors and SynnefoUsers now have
+      a deleted state. The admin tools were updated so that models are
+      now marked as deleted instead of actually being deleted from the DB.
+      A database migration is needed.
+
+
 v0.5.5 -> v0.6
 ADMIN INTERFACE
     * A new Web-based admin interface is available under /admin.

api/util.py

@@ -50,6 +50,7 @@ from django.conf import settings
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import simplejson as json
+from django.utils.cache import add_never_cache_headers
 
 from synnefo.api.faults import (Fault, BadRequest, BuildInProgress,
                                 ItemNotFound, ServiceUnavailable, Unauthorized)
@@ -211,6 +212,9 @@ def update_response_headers(request, response):
     if settings.TEST:
         response['Date'] = format_date_time(time())
     
+    add_never_cache_headers(response)
+
+
 def render_metadata(request, metadata, use_values=False, status=200):
     if request.serialization == 'xml':
         data = render_to_string('metadata.xml', {'metadata': metadata})