Revision c5e1f5cb

b/snf-cyclades-app/synnefo/plankton/backend.py
246 246 
        location = get_location(account, container, object)
247 247 
        return self._get_image(location)
248 248
249 
<<<<<<< HEAD:snf-app/synnefo/plankton/backend.py
250 249 
    def iter(self):
251 250 
        """Iter over all images available to the user"""
252 251
......
261 260 
                    if image:
262 261 
                        yield image
263 262
264 
    def iter_public(self, filters):
265 
=======
266 263 
    def iter_public(self, filters=None):
267 264 
        filters = filters or {}
268 
>>>>>>> origin/master:snf-cyclades-app/synnefo/plankton/backend.py
269 265 
        backend = self.backend
270 266
271 267 
        keys = [PLANKTON_PREFIX + 'name']

Also available in: Unified diff