Merge pull request #1111 from coreos-inc/torrent

implement torrent verb
2016-01-08 16:43:42 -05:00 · 2016-01-08 16:43:42 -05:00 · fb43c1fb10
commit fb43c1fb10
parent 269bd80f53 d21b4adc62
168 changed files with 707 additions and 294392 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,4 +10,5 @@ node_modules
 static/ldn
 static/fonts
 stack_local
+test/data/registry/
 GIT_HEAD
--- a/config.py
+++ b/config.py
@ -273,3 +273,9 @@ class DefaultConfig(object):
    'API_VERSION': 'v1',
    'API_TIMEOUT_SECONDS': 10,
  }
+
+  # Torrent management flags
+  FEATURE_BITTORRENT = False
+  TORRENT_PIECE_SIZE = 512 * 1024
+  TORRENT_ANNOUNCE_URL = 'https://localhost:6881/announce'
+  TORRENT_NAMING_SALT = '3ae93fef-c30a-427e-9ba0-eea0fd710419'
--- a/data/database.py
+++ b/data/database.py
@ -9,7 +9,7 @@ from random import SystemRandom
 from datetime import datetime
 from peewee import *
 from data.read_slave import ReadSlaveModel
-from data.fields import ResumableSHAField, JSONField
+from data.fields import ResumableSHA256Field, ResumableSHA1Field, JSONField, Base64BinaryField
 from sqlalchemy.engine.url import make_url
 from collections import defaultdict

@ -803,12 +803,14 @@ class BlobUpload(BaseModel):
  repository = ForeignKeyField(Repository, index=True)
  uuid = CharField(index=True, unique=True)
  byte_count = IntegerField(default=0)
-  sha_state = ResumableSHAField(null=True, default=resumablehashlib.sha256)
+  sha_state = ResumableSHA256Field(null=True, default=resumablehashlib.sha256)
  location = ForeignKeyField(ImageStorageLocation)
  storage_metadata = JSONField(null=True, default={})
  chunk_count = IntegerField(default=0)
  uncompressed_byte_count = IntegerField(null=True)
  created = DateTimeField(default=datetime.now, index=True)
+  piece_sha_state = ResumableSHA1Field(null=True, default=resumablehashlib.sha1)
+  piece_hashes = Base64BinaryField(null=True, default='')

  class Meta:
    database = db
@ -846,6 +848,20 @@ class QuayRelease(BaseModel):
    )


+class TorrentInfo(BaseModel):
+  storage = ForeignKeyField(ImageStorage)
+  piece_length = IntegerField()
+  pieces = Base64BinaryField()
+
+  class Meta:
+    database = db
+    read_slaves = (read_slave,)
+    indexes = (
+      # we may want to compute the piece hashes multiple times with different piece lengths
+      (('storage', 'piece_length'), True),
+    )
+
+
 all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission, Visibility,
              RepositoryTag, EmailConfirmation, FederatedLogin, LoginService, QueueItem,
              RepositoryBuild, Team, TeamMember, TeamRole, LogEntryKind, LogEntry,
@ -856,4 +872,4 @@ all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission,
              RepositoryAuthorizedEmail, ImageStorageTransformation,
              TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind,
              AccessTokenKind, Star, RepositoryActionCount, TagManifest, UserRegion,
-              QuayService, QuayRegion, QuayRelease, BlobUpload, DerivedStorageForImage]
+              QuayService, QuayRegion, QuayRelease, BlobUpload, DerivedStorageForImage, TorrentInfo]
--- a/data/fields.py
+++ b/data/fields.py
@ -5,7 +5,10 @@ import json
 from peewee import TextField


-class ResumableSHAField(TextField):
+class _ResumableSHAField(TextField):
+  def _create_sha(self):
+    raise NotImplementedError
+
  def db_value(self, value):
    sha_state = value.state()

@ -16,7 +19,7 @@ class ResumableSHAField(TextField):
    return json.dumps(sha_state)

  def python_value(self, value):
-    to_resume = resumablehashlib.sha256()
+    to_resume = self._create_sha()
    if value is None:
      return to_resume

@ -28,6 +31,16 @@ class ResumableSHAField(TextField):
    return to_resume


+class ResumableSHA256Field(_ResumableSHAField):
+  def _create_sha(self):
+    return resumablehashlib.sha256()
+
+
+class ResumableSHA1Field(_ResumableSHAField):
+  def _create_sha(self):
+    return resumablehashlib.sha1()
+
+
 class JSONField(TextField):
  def db_value(self, value):
    return json.dumps(value)
@ -36,3 +49,15 @@ class JSONField(TextField):
    if value is None or value == "":
      return {}
    return json.loads(value)
+
+
+class Base64BinaryField(TextField):
+  def db_value(self, value):
+    if value is None:
+      return None
+    return base64.b64encode(value)
+
+  def python_value(self, value):
+    if value is None:
+      return None
+    return base64.b64decode(value)
--- a/data/migrations/versions/23ca04d0bc8e_add_the_torrentinfo_table_and_torrent_.py
+++ b/data/migrations/versions/23ca04d0bc8e_add_the_torrentinfo_table_and_torrent_.py
@ -0,0 +1,40 @@
+"""Add the torrentinfo table and torrent fields on blobuploads.
+
+Revision ID: 23ca04d0bc8e
+Revises: 471caec2cb66
+Create Date: 2016-01-06 13:25:24.597037
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '23ca04d0bc8e'
+down_revision = '471caec2cb66'
+
+from alembic import op
+import sqlalchemy as sa
+
+from util.migrate import UTF8LongText
+
+def upgrade(tables):
+    ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('torrentinfo',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('storage_id', sa.Integer(), nullable=False),
+    sa.Column('piece_length', sa.Integer(), nullable=False),
+    sa.Column('pieces', sa.Text(), nullable=False),
+    sa.ForeignKeyConstraint(['storage_id'], ['imagestorage.id'], name=op.f('fk_torrentinfo_storage_id_imagestorage')),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_torrentinfo'))
+    )
+    op.create_index('torrentinfo_storage_id', 'torrentinfo', ['storage_id'], unique=False)
+    op.create_index('torrentinfo_storage_id_piece_length', 'torrentinfo', ['storage_id', 'piece_length'], unique=True)
+    op.add_column(u'blobupload', sa.Column('piece_hashes', UTF8LongText(), nullable=True))
+    op.add_column(u'blobupload', sa.Column('piece_sha_state', UTF8LongText(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade(tables):
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column(u'blobupload', 'piece_sha_state')
+    op.drop_column(u'blobupload', 'piece_hashes')
+    op.drop_table('torrentinfo')
+    ### end Alembic commands ###
--- a/data/model/init.py
+++ b/data/model/init.py
@ -8,6 +8,9 @@ class DataModelException(Exception):
 class BlobDoesNotExist(DataModelException):
  pass

+class TorrentInfoDoesNotExist(DataModelException):
+  pass
+

 class InvalidBlobUpload(DataModelException):
  pass
--- a/data/model/_basequery.py
+++ b/data/model/_basequery.py
@ -1,18 +1,19 @@
-from peewee import JOIN_LEFT_OUTER, Clause, SQL
+from peewee import Clause, SQL, fn
 from cachetools import lru_cache

+from data.model import DataModelException
 from data.database import (Repository, User, Team, TeamMember, RepositoryPermission, TeamRole,
-                           Namespace, Visibility, db_for_update)
+                           Namespace, Visibility, ImageStorage, Image, db_for_update)


 def prefix_search(field, prefix_query):
  """ Returns the wildcard match for searching for the given prefix query. """
  # Escape the known wildcard characters.
  prefix_query = (prefix_query
-    .replace('!', '!!')
-    .replace('%', '!%')
-    .replace('_', '!_')
-    .replace('[', '!['))
+                  .replace('!', '!!')
+                  .replace('%', '!%')
+                  .replace('_', '!_')
+                  .replace('[', '!['))

  return field ** Clause(prefix_query + '%', SQL("ESCAPE '!'"))

@ -46,8 +47,9 @@ def filter_to_repos_for_user(query, username=None, namespace=None, include_publi
    where_clause = (Namespace.username == namespace)

  if include_public:
-    queries.append(query.clone()
-      .where(Repository.visibility == get_public_repo_visibility(), where_clause))
+    queries.append(query
+                   .clone()
+                   .where(Repository.visibility == get_public_repo_visibility(), where_clause))

  if username:
    UserThroughTeam = User.alias()
@ -57,29 +59,32 @@ def filter_to_repos_for_user(query, username=None, namespace=None, include_publi
    AdminUser = User.alias()

    # Add repositories in which the user has permission.
-    queries.append(query.clone()
-      .switch(RepositoryPermission)
-      .join(User)
-      .where(User.username == username, where_clause))
+    queries.append(query
+                   .clone()
+                   .switch(RepositoryPermission)
+                   .join(User)
+                   .where(User.username == username, where_clause))

    # Add repositories in which the user is a member of a team that has permission.
-    queries.append(query.clone()
-      .switch(RepositoryPermission)
-      .join(Team)
-      .join(TeamMember)
-      .join(UserThroughTeam, on=(UserThroughTeam.id == TeamMember.user))
-      .where(UserThroughTeam.username == username, where_clause))
+    queries.append(query
+                   .clone()
+                   .switch(RepositoryPermission)
+                   .join(Team)
+                   .join(TeamMember)
+                   .join(UserThroughTeam, on=(UserThroughTeam.id == TeamMember.user))
+                   .where(UserThroughTeam.username == username, where_clause))

    # Add repositories under namespaces in which the user is the org admin.
-    queries.append(query.clone()
-      .switch(Repository)
-      .join(Org, on=(Repository.namespace_user == Org.id))
-      .join(AdminTeam, on=(Org.id == AdminTeam.organization))
-      .join(TeamRole, on=(AdminTeam.role == TeamRole.id))
-      .switch(AdminTeam)
-      .join(AdminTeamMember, on=(AdminTeam.id == AdminTeamMember.team))
-      .join(AdminUser, on=(AdminTeamMember.user == AdminUser.id))
-      .where(AdminUser.username == username, where_clause))
+    queries.append(query
+                   .clone()
+                   .switch(Repository)
+                   .join(Org, on=(Repository.namespace_user == Org.id))
+                   .join(AdminTeam, on=(Org.id == AdminTeam.organization))
+                   .join(TeamRole, on=(AdminTeam.role == TeamRole.id))
+                   .switch(AdminTeam)
+                   .join(AdminTeamMember, on=(AdminTeam.id == AdminTeamMember.team))
+                   .join(AdminUser, on=(AdminTeamMember.user == AdminUser.id))
+                   .where(AdminUser.username == username, where_clause))

  return reduce(lambda l, r: l | r, queries)

@ -93,3 +98,30 @@ def get_user_organizations(username):
          .join(TeamMember)
          .join(UserAlias, on=(UserAlias.id == TeamMember.user))
          .where(User.organization == True, UserAlias.username == username))
+
+
+def calculate_image_aggregate_size(ancestors_str, image_size, parent_image):
+  ancestors = ancestors_str.split('/')[1:-1]
+  if not ancestors:
+    return image_size
+
+  if parent_image is None:
+    raise DataModelException('Could not load parent image')
+
+  ancestor_size = parent_image.aggregate_size
+  if ancestor_size is not None:
+    return ancestor_size + image_size
+
+  # Fallback to a slower path if the parent doesn't have an aggregate size saved.
+  # TODO: remove this code if/when we do a full backfill.
+  ancestor_size = (ImageStorage
+                   .select(fn.Sum(ImageStorage.image_size))
+                   .join(Image)
+                   .where(Image.id << ancestors)
+                   .scalar())
+  if ancestor_size is None:
+    return None
+
+  return ancestor_size + image_size
+
+
--- a/data/model/blob.py
+++ b/data/model/blob.py
@ -11,14 +11,14 @@ def get_repo_blob_by_digest(namespace, repo_name, blob_digest):
  """
  try:
    storage_id_query = (ImageStorage
-               .select(ImageStorage.id)
-               .join(Image)
-               .join(Repository)
-               .join(Namespace, on=(Namespace.id == Repository.namespace_user))
-               .where(Repository.name == repo_name, Namespace.username == namespace,
-                      ImageStorage.content_checksum == blob_digest,
-                      ImageStorage.uploading == False)
-               .limit(1))
+                        .select(ImageStorage.id)
+                        .join(Image)
+                        .join(Repository)
+                        .join(Namespace, on=(Namespace.id == Repository.namespace_user))
+                        .where(Repository.name == repo_name, Namespace.username == namespace,
+                               ImageStorage.content_checksum == blob_digest,
+                               ImageStorage.uploading == False)
+                        .limit(1))

    return storage_model.get_storage_by_subquery(storage_id_query)
  except InvalidImageException:
@ -51,6 +51,8 @@ def store_blob_record_and_temp_link(namespace, repo_name, blob_digest, location_
    image = Image.create(storage=storage, docker_image_id=random_image_name, repository=repo)
    tag.create_temporary_hidden_tag(repo, image, link_expiration_s)

+  return storage
+

 def get_blob_upload(namespace, repo_name, upload_uuid):
  """ Load the upload which is already in progress.
--- a/data/model/image.py
+++ b/data/model/image.py
@ -2,14 +2,14 @@ import logging
 import dateutil.parser
 import random

-from peewee import JOIN_LEFT_OUTER, fn, SQL
+from peewee import JOIN_LEFT_OUTER, SQL
 from datetime import datetime

 from data.model import (DataModelException, db_transaction, _basequery, storage,
                        InvalidImageException, config)
 from data.database import (Image, Repository, ImageStoragePlacement, Namespace, ImageStorage,
                           ImageStorageLocation, RepositoryPermission, DerivedStorageForImage,
-                           ImageStorageTransformation, db_random_func, db_for_update)
+                           ImageStorageTransformation, db_random_func)


 logger = logging.getLogger(__name__)
@ -21,11 +21,11 @@ def get_repository_image_and_deriving(docker_image_id, storage_uuid):
  """
  try:
    image_found = (Image
-                    .select()
-                    .join(ImageStorage)
-                    .where(Image.docker_image_id == docker_image_id,
-                           ImageStorage.uuid == storage_uuid)
-                    .get())
+                   .select()
+                   .join(ImageStorage)
+                   .where(Image.docker_image_id == docker_image_id,
+                          ImageStorage.uuid == storage_uuid)
+                   .get())
  except Image.DoesNotExist:
    return Image.select().where(Image.id < 0) # Empty query

@ -296,18 +296,19 @@ def find_create_or_link_image(docker_image_id, repo_obj, username, translations,

 def set_image_metadata(docker_image_id, namespace_name, repository_name, created_date_str, comment,
                       command, v1_json_metadata, parent=None):
+  """ Sets metadata that is specific to how a binary piece of storage fits into the layer tree.
+  """
  with db_transaction():
-    query = (Image
-             .select(Image, ImageStorage)
-             .join(Repository)
-             .join(Namespace, on=(Repository.namespace_user == Namespace.id))
-             .switch(Image)
-             .join(ImageStorage)
-             .where(Repository.name == repository_name, Namespace.username == namespace_name,
-                    Image.docker_image_id == docker_image_id))
-
    try:
-      fetched = db_for_update(query).get()
+      fetched = (Image
+                 .select(Image, ImageStorage)
+                 .join(Repository)
+                 .join(Namespace, on=(Repository.namespace_user == Namespace.id))
+                 .switch(Image)
+                 .join(ImageStorage)
+                 .where(Repository.name == repository_name, Namespace.username == namespace_name,
+                        Image.docker_image_id == docker_image_id)
+                 .get())
    except Image.DoesNotExist:
      raise DataModelException('No image with specified id and repository')

@ -322,6 +323,7 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
    # We cleanup any old checksum in case it's a retry after a fail
    fetched.v1_checksum = None
    fetched.storage.content_checksum = None
+    fetched.storage.save()

    fetched.comment = comment
    fetched.command = command
@ -335,59 +337,6 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
    return fetched


-def set_image_size(docker_image_id, namespace_name, repository_name, image_size, uncompressed_size):
-  if image_size is None:
-    raise DataModelException('Empty image size field')
-
-  try:
-    image = (Image
-             .select(Image, ImageStorage)
-             .join(Repository)
-             .join(Namespace, on=(Repository.namespace_user == Namespace.id))
-             .switch(Image)
-             .join(ImageStorage, JOIN_LEFT_OUTER)
-             .where(Repository.name == repository_name, Namespace.username == namespace_name,
-                    Image.docker_image_id == docker_image_id)
-             .get())
-  except Image.DoesNotExist:
-    raise DataModelException('No image with specified id and repository')
-
-  image.storage.image_size = image_size
-  image.storage.uncompressed_size = uncompressed_size
-  image.storage.save()
-
-  image.aggregate_size = calculate_image_aggregate_size(image.ancestors, image.storage,
-                                                        image.parent)
-  image.save()
-
-  return image
-
-
-def calculate_image_aggregate_size(ancestors_str, image_storage, parent_image):
-  ancestors = ancestors_str.split('/')[1:-1]
-  if not ancestors:
-    return image_storage.image_size
-
-  if parent_image is None:
-    raise DataModelException('Could not load parent image')
-
-  ancestor_size = parent_image.aggregate_size
-  if ancestor_size is not None:
-    return ancestor_size + image_storage.image_size
-
-  # Fallback to a slower path if the parent doesn't have an aggregate size saved.
-  # TODO: remove this code if/when we do a full backfill.
-  ancestor_size = (ImageStorage
-                   .select(fn.Sum(ImageStorage.image_size))
-                   .join(Image)
-                   .where(Image.id << ancestors)
-                   .scalar())
-  if ancestor_size is None:
-    return None
-
-  return ancestor_size + image_storage.image_size
-
-
 def get_image(repo, docker_image_id):
  try:
    return Image.get(Image.docker_image_id == docker_image_id, Image.repository == repo)
@ -452,7 +401,8 @@ def synthesize_v1_image(repo, image_storage, docker_image_id, created_date_str,
      pass

  # Get the aggregate size for the image.
-  aggregate_size = calculate_image_aggregate_size(ancestors, image_storage, parent_image)
+  aggregate_size = _basequery.calculate_image_aggregate_size(ancestors, image_storage.image_size,
+                                                             parent_image)

  return Image.create(docker_image_id=docker_image_id, ancestors=ancestors, comment=comment,
                      command=command, v1_json_metadata=v1_json_metadata, created=created,
--- a/data/model/storage.py
+++ b/data/model/storage.py
@ -2,10 +2,11 @@ import logging

 from peewee import JOIN_LEFT_OUTER, fn, SQL

-from data.model import config, db_transaction, InvalidImageException
-from data.database import (ImageStorage, Image, DerivedStorageForImage, ImageStoragePlacement,
-                           ImageStorageLocation, ImageStorageTransformation, ImageStorageSignature,
-                           ImageStorageSignatureKind, Repository, Namespace)
+from data.model import (config, db_transaction, InvalidImageException, TorrentInfoDoesNotExist,
+                        DataModelException, _basequery)
+from data.database import (ImageStorage, Image, ImageStoragePlacement, ImageStorageLocation,
+                           ImageStorageTransformation, ImageStorageSignature,
+                           ImageStorageSignatureKind, Repository, Namespace, TorrentInfo)


 logger = logging.getLogger(__name__)
@ -203,6 +204,39 @@ def _reduce_as_tree(queries_to_reduce):
  return to_reduce_left.union_all(to_reduce_right)


+def set_image_storage_metadata(docker_image_id, namespace_name, repository_name, image_size,
+                               uncompressed_size):
+  """ Sets metadata that is specific to the binary storage of the data, irrespective of how it
+      is used in the layer tree.
+  """
+  if image_size is None:
+    raise DataModelException('Empty image size field')
+
+  try:
+    image = (Image
+             .select(Image, ImageStorage)
+             .join(Repository)
+             .join(Namespace, on=(Repository.namespace_user == Namespace.id))
+             .switch(Image)
+             .join(ImageStorage)
+             .where(Repository.name == repository_name, Namespace.username == namespace_name,
+                    Image.docker_image_id == docker_image_id)
+             .get())
+  except ImageStorage.DoesNotExist:
+    raise InvalidImageException('No image with specified id and repository')
+
+  # We MUST do this here, it can't be done in the corresponding image call because the storage
+  # has not yet been pushed
+  image.aggregate_size = _basequery.calculate_image_aggregate_size(image.ancestors, image_size,
+                                                                   image.parent)
+  image.save()
+
+  image.storage.image_size = image_size
+  image.storage.uncompressed_size = uncompressed_size
+  image.storage.save()
+  return image.storage
+
+
 def get_storage_locations(uuid):
  query = (ImageStoragePlacement
           .select()
@ -212,3 +246,16 @@ def get_storage_locations(uuid):
           .where(ImageStorage.uuid == uuid))

  return [location.location.name for location in query]
+
+
+def save_torrent_info(storage_object, piece_length, pieces):
+  TorrentInfo.create(storage=storage_object, piece_length=piece_length, pieces=pieces)
+
+def get_torrent_info(blob):
+  try:
+    return (TorrentInfo
+            .select()
+            .where(blob == TorrentInfo.storage)
+            .get())
+  except TorrentInfo.DoesNotExist:
+    raise TorrentInfoDoesNotExist
--- a/data/model/user.py
+++ b/data/model/user.py
@ -255,6 +255,7 @@ def regenerate_robot_token(robot_shortname, parent):
  robot = lookup_robot(robot_username)
  password = random_string_generator(length=64)()
  robot.email = password
+  robot.uuid = str(uuid4())

  service = LoginService.get(name='quayrobot')
  login = FederatedLogin.get(FederatedLogin.user == robot, FederatedLogin.service == service)
--- a/endpoints/api/repository.py
+++ b/endpoints/api/repository.py
@ -18,7 +18,7 @@ from endpoints.api import (truthy_bool, format_date, nickname, log_action, valid
                           request_error, require_scope, Unauthorized, NotFound, InvalidRequest,
                           path_param, ExceedsLicenseException)
 from endpoints.api.billing import lookup_allowed_private_repos, get_namespace_plan
-from endpoints.common import check_repository_usage
+from endpoints.api.subscribe import check_repository_usage

 from auth.permissions import (ModifyRepositoryPermission, AdministerRepositoryPermission,
                              CreateRepositoryPermission)
--- a/endpoints/api/subscribe.py
+++ b/endpoints/api/subscribe.py
@ -5,7 +5,6 @@ import stripe

 from app import billing
 from endpoints.api import request_error, log_action, NotFound
-from endpoints.common import check_repository_usage
 from data import model
 from data.billing import PLANS

@ -15,6 +14,20 @@ import features
 logger = logging.getLogger(__name__)


+def check_repository_usage(user_or_org, plan_found):
+  private_repos = model.user.get_private_repo_count(user_or_org.username)
+  if plan_found is None:
+    repos_allowed = 0
+  else:
+    repos_allowed = plan_found['privateRepos']
+
+  if private_repos > repos_allowed:
+    model.notification.create_unique_notification('over_private_usage', user_or_org,
+                                           {'namespace': user_or_org.username})
+  else:
+    model.notification.delete_notifications_by_kind(user_or_org, 'over_private_usage')
+
+
 def carderror_response(exc):
  return {'carderror': exc.message}, 402

--- a/endpoints/common.py
+++ b/endpoints/common.py
@ -14,12 +14,10 @@ from flask.ext.principal import identity_changed
 from random import SystemRandom
 from cachetools import lru_cache

-from data import model
 from app import app, oauth_apps, LoginWrappedDBUser

 from auth.permissions import QuayDeferredPermissionUser
 from auth import scopes
-from endpoints.api.discovery import swagger_route_data
 from werkzeug.routing import BaseConverter
 from functools import wraps
 from config import frontend_visible_config
@ -79,15 +77,6 @@ def route_hide_if(value):
  return decorator


-def get_route_data():
-  global route_data
-  if route_data:
-    return route_data
-
-  route_data = swagger_route_data(include_internal=True, compact=True)
-  return route_data
-
-
 def truthy_param(param):
  return param not in {False, 'false', 'False', '0', 'FALSE', '', 'null'}

@ -139,7 +128,7 @@ def _get_version_number():
  except IOError:
    return ''

-def render_page_template(name, **kwargs):
+def render_page_template(name, route_data=None, **kwargs):
  debugging = app.config.get('DEBUGGING', False)
  if debugging:
    # If DEBUGGING is enabled, then we load the full set of individual JS and CSS files
@ -187,7 +176,7 @@ def render_page_template(name, **kwargs):
    version_number = ' - ' + _get_version_number()

  resp = make_response(render_template(name,
-                                       route_data=json.dumps(get_route_data()),
+                                       route_data=json.dumps(route_data),
                                       external_styles=external_styles,
                                       external_scripts=external_scripts,
                                       main_styles=add_cachebusters(main_styles),
@ -214,17 +203,3 @@ def render_page_template(name, **kwargs):
  resp.headers['X-FRAME-OPTIONS'] = 'DENY'
  return resp

-
-def check_repository_usage(user_or_org, plan_found):
-  private_repos = model.user.get_private_repo_count(user_or_org.username)
-  if plan_found is None:
-    repos_allowed = 0
-  else:
-    repos_allowed = plan_found['privateRepos']
-
-  if private_repos > repos_allowed:
-    model.notification.create_unique_notification('over_private_usage', user_or_org,
-                                           {'namespace': user_or_org.username})
-  else:
-    model.notification.delete_notifications_by_kind(user_or_org, 'over_private_usage')
-
--- a/endpoints/oauthlogin.py
+++ b/endpoints/oauthlogin.py
@ -4,7 +4,8 @@ import requests
 from flask import request, redirect, url_for, Blueprint
 from flask.ext.login import current_user

-from endpoints.common import render_page_template, common_login, route_show_if
+from endpoints.common import common_login, route_show_if
+from endpoints.web import render_page_template_with_routedata
 from app import app, analytics, get_app_url, github_login, google_login, dex_login
 from data import model
 from util.names import parse_repository_name
@ -22,10 +23,12 @@ oauthlogin = Blueprint('oauthlogin', __name__)

 def render_ologin_error(service_name,
                        error_message='Could not load user data. The token may have expired.'):
-  return render_page_template('ologinerror.html', service_name=service_name,
-                              error_message=error_message,
-                              service_url=get_app_url(),
-                              user_creation=features.USER_CREATION and features.DIRECT_LOGIN)
+  user_creation = features.USER_CREATION and features.DIRECT_LOGIN
+  return render_page_template_with_routedata('ologinerror.html',
+                                              service_name=service_name,
+                                              error_message=error_message,
+                                              service_url=get_app_url(),
+                                              user_creation=user_creation)


 def get_user(service, token):
--- a/endpoints/v1/registry.py
+++ b/endpoints/v1/registry.py
@ -18,6 +18,7 @@ from auth.permissions import (ReadRepositoryPermission,
                              ModifyRepositoryPermission)
 from data import model, database
 from util.registry import gzipstream
+from util.registry.torrent import PieceHasher
 from endpoints.v1 import v1_bp
 from endpoints.decorators import anon_protect

@ -214,6 +215,10 @@ def put_image_layer(namespace, repository, image_id):
  size_info, size_hndlr = gzipstream.calculate_size_handler()
  sr.add_handler(size_hndlr)

+  # Add a handler to hash the chunks of the upload for torrenting
+  piece_hasher = PieceHasher(app.config['TORRENT_PIECE_SIZE'])
+  sr.add_handler(piece_hasher.update)
+
  # Add a handler which computes the checksum.
  h, sum_hndlr = checksums.simple_checksum_handler(json_data)
  sr.add_handler(sum_hndlr)
@ -231,8 +236,11 @@ def put_image_layer(namespace, repository, image_id):
      abort(520, 'Image %(image_id)s could not be written. Please try again.', image_id=image_id)

  # Save the size of the image.
-  model.image.set_image_size(image_id, namespace, repository, size_info.compressed_size,
-                             size_info.uncompressed_size)
+  updated_storage = model.storage.set_image_storage_metadata(image_id, namespace, repository,
+                                                             size_info.compressed_size,
+                                                             size_info.uncompressed_size)
+  pieces_bytes = piece_hasher.final_piece_hashes()
+  model.storage.save_torrent_info(updated_storage, app.config['TORRENT_PIECE_SIZE'], pieces_bytes)

  # Append the computed checksum.
  csums = []
--- a/endpoints/v2/blob.py
+++ b/endpoints/v2/blob.py
@ -14,6 +14,7 @@ from endpoints.decorators import anon_protect
 from util.cache import cache_control
 from util.registry.filelike import wrap_with_handler, StreamSlice
 from util.registry.gzipstream import calculate_size_handler
+from util.registry.torrent import PieceHasher
 from storage.basestorage import InvalidChunkException


@ -221,6 +222,13 @@ def _upload_chunk(namespace, repo_name, upload_uuid):

    input_fp = wrap_with_handler(input_fp, found.sha_state.update)

+    piece_hasher = None
+    # TODO remove this when all in-progress blob uploads reliably contain piece hashes
+    if start_offset == 0 or found.piece_sha_state is not None:
+      piece_hasher = PieceHasher(app.config['TORRENT_PIECE_SIZE'], start_offset, found.piece_hashes,
+                                 found.piece_sha_state)
+      input_fp = wrap_with_handler(input_fp, piece_hasher.update)
+
    # If this is the first chunk and we're starting at the 0 offset, add a handler to gunzip the
    # stream so we can determine the uncompressed size. We'll throw out this data if another chunk
    # comes in, but in the common case Docker only sends one chunk.
@ -231,7 +239,8 @@ def _upload_chunk(namespace, repo_name, upload_uuid):

    try:
      length_written, new_metadata, error = storage.stream_upload_chunk(location_set, upload_uuid,
-                                                                        start_offset, length, input_fp,
+                                                                        start_offset, length,
+                                                                        input_fp,
                                                                        found.storage_metadata,
                                                                        content_type=BLOB_CONTENT_TYPE)
    except InvalidChunkException:
@ -246,6 +255,10 @@ def _upload_chunk(namespace, repo_name, upload_uuid):
    # know the uncompressed size.
    found.uncompressed_byte_count = None

+  if piece_hasher is not None:
+    found.piece_hashes = piece_hasher.piece_hashes
+    found.piece_sha_state = piece_hasher.hash_fragment
+
  found.storage_metadata = new_metadata
  found.byte_count += length_written
  found.chunk_count += 1
@ -262,7 +275,8 @@ def _finish_upload(namespace, repo_name, upload_obj, expected_digest):

  # Move the storage into place, or if this was a re-upload, cancel it
  with database.CloseForLongOperation(app.config):
-    if storage.exists({upload_obj.location.name}, final_blob_location):
+    already_exists = storage.exists({upload_obj.location.name}, final_blob_location)
+    if already_exists:
      # It already existed, clean up our upload which served as proof that we had the file
      storage.cancel_chunked_upload({upload_obj.location.name}, upload_obj.uuid,
                                    upload_obj.storage_metadata)
@ -274,10 +288,15 @@ def _finish_upload(namespace, repo_name, upload_obj, expected_digest):
                                      final_blob_location, upload_obj.storage_metadata)

  # Mark the blob as uploaded.
-  model.blob.store_blob_record_and_temp_link(namespace, repo_name, expected_digest,
-                                             upload_obj.location, upload_obj.byte_count,
-                                             app.config['PUSH_TEMP_TAG_EXPIRATION_SEC'],
-                                             upload_obj.uncompressed_byte_count)
+  blob_storage = model.blob.store_blob_record_and_temp_link(namespace, repo_name, expected_digest,
+                                                            upload_obj.location,
+                                                            upload_obj.byte_count,
+                                                            app.config['PUSH_TEMP_TAG_EXPIRATION_SEC'],
+                                                            upload_obj.uncompressed_byte_count)
+
+  if upload_obj.piece_sha_state is not None and not already_exists:
+    piece_bytes = upload_obj.piece_hashes + upload_obj.piece_sha_state.digest()
+    model.storage.save_torrent_info(blob_storage, app.config['TORRENT_PIECE_SIZE'], piece_bytes)

  # Delete the upload tracking row.
  upload_obj.delete_instance()
--- a/endpoints/verbs.py
+++ b/endpoints/verbs.py
@ -4,8 +4,9 @@ import hashlib

 from flask import redirect, Blueprint, abort, send_file, make_response

-from app import app, signer
+from app import app, signer, storage
 from auth.auth import process_auth
+from auth.auth_context import get_authenticated_user
 from auth.permissions import ReadRepositoryPermission
 from data import model, database
 from endpoints.trackhelper import track_and_log
@ -14,15 +15,24 @@ from storage import Storage

 from util.registry.queuefile import QueueFile
 from util.registry.queueprocess import QueueProcess
+from util.registry.torrent import (make_torrent, per_user_torrent_filename, public_torrent_filename,
+                                   PieceHasher)
+from util.registry.filelike import wrap_with_handler
+from util.registry.gzipstream import SizeInfo
 from formats.squashed import SquashedDockerImage
 from formats.aci import ACIImage
+from endpoints.v2.blob import BLOB_DIGEST_ROUTE
+from endpoints.common import route_show_if
+
+import features


 verbs = Blueprint('verbs', __name__)
 logger = logging.getLogger(__name__)


-def _open_stream(formatter, namespace, repository, tag, synthetic_image_id, image_json, repo_image):
+def _open_stream(formatter, namespace, repository, tag, synthetic_image_id, image_json, repo_image,
+                 handlers):
  store = Storage(app)

  # For performance reasons, we load the full image list here, cache it, then disconnect from
@ -52,10 +62,13 @@ def _open_stream(formatter, namespace, repository, tag, synthetic_image_id, imag
  stream = formatter.build_stream(namespace, repository, tag, synthetic_image_id, image_json,
                                  get_next_image, get_next_layer, get_image_json)

+  for handler_fn in handlers:
+    stream = wrap_with_handler(stream, handler_fn)
+
  return stream.read


-def _sign_sythentic_image(verb, linked_storage_uuid, queue_file):
+def _sign_synthetic_image(verb, linked_storage_uuid, queue_file):
  signature = None
  try:
    signature = signer.detached_sign(queue_file)
@ -197,12 +210,20 @@ def _repo_verb(namespace, repository, tag, verb, formatter, sign=False, checker=
    # Close any existing DB connection once the process has exited.
    database.close_db_filter(None)

+  hasher = PieceHasher(app.config['TORRENT_PIECE_SIZE'])
+  def _store_metadata_and_cleanup():
+    with database.UseThenDisconnect(app.config):
+      model.storage.save_torrent_info(derived, app.config['TORRENT_PIECE_SIZE'],
+                                      hasher.final_piece_hashes())
+
  # Create a queue process to generate the data. The queue files will read from the process
  # and send the results to the client and storage.
-  args = (formatter, namespace, repository, tag, synthetic_image_id, image_json, repo_image)
+  handlers = [hasher.update]
+  args = (formatter, namespace, repository, tag, synthetic_image_id, image_json, repo_image,
+          handlers)
  queue_process = QueueProcess(_open_stream,
                               8 * 1024, 10 * 1024 * 1024, # 8K/10M chunk/max
-                               args, finished=_cleanup)
+                               args, finished=_store_metadata_and_cleanup)

  client_queue_file = QueueFile(queue_process.create_queue(), 'client')
  storage_queue_file = QueueFile(queue_process.create_queue(), 'storage')
@ -221,7 +242,7 @@ def _repo_verb(namespace, repository, tag, verb, formatter, sign=False, checker=

  if sign and signer.name:
    signing_args = (verb, derived.uuid, signing_queue_file)
-    QueueProcess.run_process(_sign_sythentic_image, signing_args, finished=_cleanup)
+    QueueProcess.run_process(_sign_synthetic_image, signing_args, finished=_cleanup)

  # Close the database handle here for this process before we send the long download.
  database.close_db_filter(None)
@ -275,3 +296,47 @@ def get_aci_image(server, namespace, repository, tag, os, arch):
 def get_squashed_tag(namespace, repository, tag):
  return _repo_verb(namespace, repository, tag, 'squash', SquashedDockerImage())

+
+@route_show_if(features.BITTORRENT)
+@anon_protect
+@verbs.route('/torrent{0}'.format(BLOB_DIGEST_ROUTE), methods=['GET'])
+@process_auth
+def get_tag_torrent(namespace, repo_name, digest):
+  permission = ReadRepositoryPermission(namespace, repo_name)
+  public_repo = model.repository.repository_is_public(namespace, repo_name)
+  if not permission.can() and not public_repo:
+    abort(403)
+
+  user = get_authenticated_user()
+  if user is None and not public_repo:
+    # We can not generate a private torrent cluster without a user uuid (e.g. token auth)
+    abort(403)
+
+  try:
+    blob = model.blob.get_repo_blob_by_digest(namespace, repo_name, digest)
+  except model.BlobDoesNotExist:
+    abort(404)
+
+  path = model.storage.get_layer_path(blob)
+  webseed = storage.get_direct_download_url(blob.locations, path)
+  if webseed is None:
+    # We cannot support webseeds for storages that cannot provide direct downloads.
+    abort(make_response('Storage engine does not support seeding.', 501))
+
+  try:
+    torrent_info = model.storage.get_torrent_info(blob)
+  except model.TorrentInfoDoesNotExist:
+    abort(404)
+
+  if public_repo:
+    name = public_torrent_filename(blob.uuid)
+  else:
+    name = per_user_torrent_filename(user.uuid, blob.uuid)
+
+  torrent_file = make_torrent(name, webseed, blob.image_size,
+                              torrent_info.piece_length, torrent_info.pieces)
+
+  headers = {'Content-Type': 'application/x-bittorrent',
+             'Content-Disposition': 'attachment; filename={0}.torrent'.format(name)}
+
+  return make_response(torrent_file, 200, headers)
--- a/endpoints/web.py
+++ b/endpoints/web.py
@ -1,67 +1,76 @@
+import json
 import logging

+from base64 import urlsafe_b64encode
+from cachetools import lru_cache
+from cryptography.x509 import load_pem_x509_certificate
+from cryptography.hazmat.backends import default_backend
 from flask import (abort, redirect, request, url_for, make_response, Response,
                   Blueprint, send_from_directory, jsonify, send_file)
-
 from flask.ext.login import current_user
 from urlparse import urlparse
-from health.healthcheck import get_healthchecker

-from data import model
-from data.database import db
+import features
+
 from app import app, billing as stripe, build_logs, avatar, signer, log_archive, config_provider
+from auth import scopes
 from auth.auth import require_session_login, process_oauth
 from auth.permissions import (AdministerOrganizationPermission, ReadRepositoryPermission,
                              SuperUserPermission, AdministerRepositoryPermission,
                              ModifyRepositoryPermission)
-
-from util.invoice import renderInvoiceToPdf
-from util.seo import render_snapshot
-from util.cache import no_cache
-from endpoints.common import common_login, render_page_template, route_show_if, param_required
-from endpoints.decorators import anon_protect, anon_allowed
-from endpoints.csrf import csrf_protect, generate_csrf_token, verify_csrf
-
-from buildtrigger.customhandler import CustomBuildTrigger
-from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
-from buildtrigger.triggerutil import TriggerProviderException
 from buildtrigger.basehandler import BuildTriggerHandler
-
-from util.names import parse_repository_name, parse_repository_name_and_tag
-from util.useremails import send_email_changed
-from util.systemlogs import build_logs_archive
+from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
+from buildtrigger.customhandler import CustomBuildTrigger
+from buildtrigger.triggerutil import TriggerProviderException
+from data import model
+from data.database import db
+from endpoints.api.discovery import swagger_route_data
+from endpoints.common import common_login, render_page_template, route_show_if, param_required
+from endpoints.csrf import csrf_protect, generate_csrf_token, verify_csrf
+from endpoints.decorators import anon_protect, anon_allowed
+from health.healthcheck import get_healthchecker
+from util.cache import no_cache
 from util.headers import parse_basic_auth
-from auth import scopes
-
-import features
-import json
+from util.invoice import renderInvoiceToPdf
+from util.names import parse_repository_name, parse_repository_name_and_tag
+from util.seo import render_snapshot
+from util.systemlogs import build_logs_archive
+from util.useremails import send_email_changed


-logger = logging.getLogger(__name__)

+@lru_cache(maxsize=1)
+def _get_route_data():
+  return swagger_route_data(include_internal=True, compact=True)
+
+
+def render_page_template_with_routedata(name, *args, **kwargs):
+  return render_page_template(name, _get_route_data(), *args, **kwargs)

 # Capture the unverified SSL errors.
+logger = logging.getLogger(__name__)
 logging.captureWarnings(True)

 web = Blueprint('web', __name__)

 STATUS_TAGS = app.config['STATUS_TAGS']
+JWT_ISSUER = app.config.get('JWT_AUTH_TOKEN_ISSUER')


@web.route('/', methods=['GET'], defaults={'path': ''})
@no_cache
 def index(path, **kwargs):
-  return render_page_template('index.html', **kwargs)
+  return render_page_template_with_routedata('index.html', **kwargs)


@web.route('/500', methods=['GET'])
 def internal_error_display():
-  return render_page_template('500.html')
+  return render_page_template_with_routedata('500.html')

@web.errorhandler(404)
@web.route('/404', methods=['GET'])
 def not_found_error_display(e = None):
-  resp = render_page_template('404.html')
+  resp = render_page_template_with_routedata('404.html')
  resp.status_code = 404
  return resp

@ -265,19 +274,19 @@ def dbrevision_health():
@web.route('/tos', methods=['GET'])
@no_cache
 def tos():
-  return render_page_template('tos.html')
+  return render_page_template_with_routedata('tos.html')


@web.route('/disclaimer', methods=['GET'])
@no_cache
 def disclaimer():
-  return render_page_template('disclaimer.html')
+  return render_page_template_with_routedata('disclaimer.html')


@web.route('/privacy', methods=['GET'])
@no_cache
 def privacy():
-  return render_page_template('privacy.html')
+  return render_page_template_with_routedata('privacy.html')


@web.route('/robots.txt', methods=['GET'])
@ -352,7 +361,7 @@ def confirm_repo_email():
  try:
    record = model.repository.confirm_email_authorization_for_repo(code)
  except model.DataModelException as ex:
-    return render_page_template('confirmerror.html', error_message=ex.message)
+    return render_page_template_with_routedata('confirmerror.html', error_message=ex.message)

  message = """
  Your E-mail address has been authorized to receive notifications for repository
@ -361,7 +370,7 @@ def confirm_repo_email():
         record.repository.namespace_user.username, record.repository.name,
         record.repository.namespace_user.username, record.repository.name)

-  return render_page_template('message.html', message=message)
+  return render_page_template_with_routedata('message.html', message=message)


@web.route('/confirm', methods=['GET'])
@ -375,7 +384,7 @@ def confirm_email():
  try:
    user, new_email, old_email = model.user.confirm_user_email(code)
  except model.DataModelException as ex:
-    return render_page_template('confirmerror.html', error_message=ex.message)
+    return render_page_template_with_routedata('confirmerror.html', error_message=ex.message)

  if new_email:
    send_email_changed(user.username, old_email, new_email)
@ -467,9 +476,9 @@ def oauth_local_handler():
    return

  if not request.args.get('scope'):
-    return render_page_template("message.html", message="Authorization canceled")
+    return render_page_template_with_routedata("message.html", message="Authorization canceled")
  else:
-    return render_page_template("generatedtoken.html")
+    return render_page_template_with_routedata("generatedtoken.html")


@web.route('/oauth/denyapp', methods=['POST'])
@ -533,12 +542,12 @@ def request_authorization_code():

    # Show the authorization page.
    has_dangerous_scopes = any([check_scope['dangerous'] for check_scope in scope_info])
-    return render_page_template('oauthorize.html', scopes=scope_info,
-                                has_dangerous_scopes=has_dangerous_scopes,
-                                application=oauth_app_view,
-                                enumerate=enumerate, client_id=client_id,
-                                redirect_uri=redirect_uri, scope=scope,
-                                csrf_token_val=generate_csrf_token())
+    return render_page_template_with_routedata('oauthorize.html', scopes=scope_info,
+                                               has_dangerous_scopes=has_dangerous_scopes,
+                                               application=oauth_app_view,
+                                               enumerate=enumerate, client_id=client_id,
+                                               redirect_uri=redirect_uri, scope=scope,
+                                               csrf_token_val=generate_csrf_token())

  if response_type == 'token':
    return provider.get_token_response(response_type, client_id, redirect_uri, scope=scope)
@ -676,3 +685,23 @@ def redirect_to_namespace(namespace):
    return redirect(url_for('web.org_view', path=namespace))
  else:
    return redirect(url_for('web.user_view', path=namespace))
+
+@lru_cache(maxsize=1)
+def _load_certificate_bytes(certificate_file_path):
+  with open(certificate_file_path) as cert_file:
+    return load_pem_x509_certificate(cert_file.read(), default_backend()).public_key()
+
+@route_show_if(features.BITTORRENT)
+@web.route('/keys', methods=['GET'])
+def jwk_set_uri():
+  certificate = _load_certificate_bytes(app.config['JWT_AUTH_CERTIFICATE_PATH'])
+  return jsonify({
+    'keys': [{
+      'kty': 'RSA',
+      'alg': 'RSA256',
+      'use': 'sig',
+      'n': urlsafe_b64encode(str(certificate.public_numbers().n)),
+      'e': urlsafe_b64encode(str(certificate.public_numbers().e)),
+    }],
+    'issuer': JWT_ISSUER,
+  })
--- a/initdb.py
+++ b/initdb.py
@ -81,10 +81,8 @@ def __create_subtree(repo, structure, creator_username, parent, tag_map):
    checksum = __gen_checksum(docker_image_id)

    new_image = model.image.find_create_or_link_image(docker_image_id, repo, None, {}, 'local_us')
-    new_image_locations = new_image.storage.locations
    new_image.storage.uuid = __gen_image_uuid(repo, image_num)
    new_image.storage.uploading = False
-    new_image.storage.content_checksum = checksum
    new_image.storage.save()

    # Write some data for the storage.
@ -113,10 +111,12 @@ def __create_subtree(repo, structure, creator_username, parent, tag_map):
    new_image = model.image.set_image_metadata(docker_image_id, repo.namespace_user.username,
                                               repo.name, str(creation_time), 'no comment', command,
                                               json.dumps(v1_metadata), parent)
+    new_image.storage.content_checksum = checksum
+    new_image.storage.save()

    compressed_size = random.randrange(1, 1024 * 1024 * 1024)
-    model.image.set_image_size(docker_image_id, repo.namespace_user.username, repo.name,
-                               compressed_size, int(compressed_size * 1.4))
+    model.storage.set_image_storage_metadata(docker_image_id, repo.namespace_user.username,
+                                             repo.name, compressed_size, int(compressed_size * 1.4))

    parent = new_image

--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@ -59,3 +59,4 @@ jsonpath-rw
 bintrees
 redlock
 semantic-version
+bencode
--- a/requirements.txt
+++ b/requirements.txt
@ -4,7 +4,8 @@ APScheduler==3.0.3
 autobahn==0.9.3-3
 Babel==1.3
 beautifulsoup4==4.4.0
-bintrees==2.0.2
+bencode==1.0
+bintrees==2.0.3
 blinker==1.3
 boto==2.38.0
 cachetools==1.0.3
--- a/test/data/registry/us/sharedimages/08f811d9-8451-6a40-04fa-53d80c753872/diffs.json
+++ b/test/data/registry/us/sharedimages/08f811d9-8451-6a40-04fa-53d80c753872/diffs.json
--- a/test/data/registry/us/sharedimages/099f6669-d869-6724-be3e-e96a41e27f5f/diffs.json
+++ b/test/data/registry/us/sharedimages/099f6669-d869-6724-be3e-e96a41e27f5f/diffs.json
--- a/test/data/registry/us/sharedimages/0b0a3438-59d2-e480-77bd-9e4e2f1a0eef/diffs.json
+++ b/test/data/registry/us/sharedimages/0b0a3438-59d2-e480-77bd-9e4e2f1a0eef/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/0b3c75d4-ebfc-206b-003a-189013c32a4f/diffs.json
+++ b/test/data/registry/us/sharedimages/0b3c75d4-ebfc-206b-003a-189013c32a4f/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/0c2422ba-8a43-493e-891b-06077420839c/diffs.json
+++ b/test/data/registry/us/sharedimages/0c2422ba-8a43-493e-891b-06077420839c/diffs.json
--- a/test/data/registry/us/sharedimages/0c4ace37-4cd8-2b59-b4d5-85b8ee596f4c/diffs.json
+++ b/test/data/registry/us/sharedimages/0c4ace37-4cd8-2b59-b4d5-85b8ee596f4c/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/0ccb6d85-9cbd-f08f-5c71-132707e144fc/diffs.json
+++ b/test/data/registry/us/sharedimages/0ccb6d85-9cbd-f08f-5c71-132707e144fc/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/0e621287-d1eb-7c09-4af1-78a9c54ef5f1/diffs.json
+++ b/test/data/registry/us/sharedimages/0e621287-d1eb-7c09-4af1-78a9c54ef5f1/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/0eaf8aa3-a464-0429-b0a3-5f66ecb237d0/diffs.json
+++ b/test/data/registry/us/sharedimages/0eaf8aa3-a464-0429-b0a3-5f66ecb237d0/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/139483eb-b75f-600b-c997-46c6d99b9e53/diffs.json
+++ b/test/data/registry/us/sharedimages/139483eb-b75f-600b-c997-46c6d99b9e53/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/14c839f5-acd4-b9ed-0929-c60f6ad8b6ec/diffs.json
+++ b/test/data/registry/us/sharedimages/14c839f5-acd4-b9ed-0929-c60f6ad8b6ec/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/1589c8c3-a362-4334-b643-4aea63843912/diffs.json
+++ b/test/data/registry/us/sharedimages/1589c8c3-a362-4334-b643-4aea63843912/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/181175a1-ef21-0690-226a-fea91a70b6c0/diffs.json
+++ b/test/data/registry/us/sharedimages/181175a1-ef21-0690-226a-fea91a70b6c0/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/18650e7f-9bf1-6dcd-9afd-f4653df5c7d6/diffs.json
+++ b/test/data/registry/us/sharedimages/18650e7f-9bf1-6dcd-9afd-f4653df5c7d6/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/1b9ecae5-2692-1c2f-5009-4fd119454035/diffs.json
+++ b/test/data/registry/us/sharedimages/1b9ecae5-2692-1c2f-5009-4fd119454035/diffs.json
--- a/test/data/registry/us/sharedimages/1bc677b9-8109-447e-74ba-45d50f0b8e7c/diffs.json
+++ b/test/data/registry/us/sharedimages/1bc677b9-8109-447e-74ba-45d50f0b8e7c/diffs.json
--- a/test/data/registry/us/sharedimages/1d185a64-afb8-d3cd-6207-67467c9a6dc7/diffs.json
+++ b/test/data/registry/us/sharedimages/1d185a64-afb8-d3cd-6207-67467c9a6dc7/diffs.json
--- a/test/data/registry/us/sharedimages/1d42f7d2-614d-a212-286f-72376617d2d9/diffs.json
+++ b/test/data/registry/us/sharedimages/1d42f7d2-614d-a212-286f-72376617d2d9/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/1d8cbff4-e036-3d18-26c6-a0b64ef0bc50/diffs.json
+++ b/test/data/registry/us/sharedimages/1d8cbff4-e036-3d18-26c6-a0b64ef0bc50/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/1e77ef97-2557-ce9c-bfc7-6f2ec55b03ba/diffs.json
+++ b/test/data/registry/us/sharedimages/1e77ef97-2557-ce9c-bfc7-6f2ec55b03ba/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/2108a4aa-58d8-fad0-c565-b7183456333f/diffs.json
+++ b/test/data/registry/us/sharedimages/2108a4aa-58d8-fad0-c565-b7183456333f/diffs.json
--- a/test/data/registry/us/sharedimages/2569c965-1ba5-cbf5-89cd-d5fd8ab8170c/diffs.json
+++ b/test/data/registry/us/sharedimages/2569c965-1ba5-cbf5-89cd-d5fd8ab8170c/diffs.json
--- a/test/data/registry/us/sharedimages/288d5833-8eb8-e2f1-b9ac-b40d9ac89d78/diffs.json
+++ b/test/data/registry/us/sharedimages/288d5833-8eb8-e2f1-b9ac-b40d9ac89d78/diffs.json
--- a/test/data/registry/us/sharedimages/2c143676-ae89-8ec8-5a0a-2063702d37ce/diffs.json
+++ b/test/data/registry/us/sharedimages/2c143676-ae89-8ec8-5a0a-2063702d37ce/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/2cad4bce-d00c-f695-d629-7c0a1733464d/diffs.json
+++ b/test/data/registry/us/sharedimages/2cad4bce-d00c-f695-d629-7c0a1733464d/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/2e8e1e4b-6152-baee-81a2-504957511b15/diffs.json
+++ b/test/data/registry/us/sharedimages/2e8e1e4b-6152-baee-81a2-504957511b15/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/2ef32f59-cf66-6695-126b-a9280a3ba282/diffs.json
+++ b/test/data/registry/us/sharedimages/2ef32f59-cf66-6695-126b-a9280a3ba282/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/30cf9ab8-f12f-9494-3991-9c200b888b55/diffs.json
+++ b/test/data/registry/us/sharedimages/30cf9ab8-f12f-9494-3991-9c200b888b55/diffs.json
--- a/test/data/registry/us/sharedimages/329ef27a-3773-c398-931b-9fde1ee3b650/diffs.json
+++ b/test/data/registry/us/sharedimages/329ef27a-3773-c398-931b-9fde1ee3b650/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/3bbbff55-2597-5471-7026-e3da0f54bca8/diffs.json
+++ b/test/data/registry/us/sharedimages/3bbbff55-2597-5471-7026-e3da0f54bca8/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/41859123-0d57-5674-c56c-e53b940ae6b5/diffs.json
+++ b/test/data/registry/us/sharedimages/41859123-0d57-5674-c56c-e53b940ae6b5/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/4191cde9-894b-8864-4a36-b526979a7d89/diffs.json
+++ b/test/data/registry/us/sharedimages/4191cde9-894b-8864-4a36-b526979a7d89/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/42c7cb82-ae24-558a-ff7d-fa3f80150a40/diffs.json
+++ b/test/data/registry/us/sharedimages/42c7cb82-ae24-558a-ff7d-fa3f80150a40/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/42ca1174-def3-c7ed-1ee7-627b0cb8d54d/diffs.json
+++ b/test/data/registry/us/sharedimages/42ca1174-def3-c7ed-1ee7-627b0cb8d54d/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/43839fc1-f7d7-1672-3687-1fac6b0bc260/diffs.json
+++ b/test/data/registry/us/sharedimages/43839fc1-f7d7-1672-3687-1fac6b0bc260/diffs.json
--- a/test/data/registry/us/sharedimages/44bff166-b20e-ba79-f473-dfc364282b40/diffs.json
+++ b/test/data/registry/us/sharedimages/44bff166-b20e-ba79-f473-dfc364282b40/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/47f6628f-60a0-12e1-0865-362cfaf3625a/diffs.json
+++ b/test/data/registry/us/sharedimages/47f6628f-60a0-12e1-0865-362cfaf3625a/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/4b2b8766-1ee1-d4cc-1278-fd8ee99fcda9/diffs.json
+++ b/test/data/registry/us/sharedimages/4b2b8766-1ee1-d4cc-1278-fd8ee99fcda9/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/4e37351a-7cad-cc0a-a421-13abf78964cb/diffs.json
+++ b/test/data/registry/us/sharedimages/4e37351a-7cad-cc0a-a421-13abf78964cb/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/4f0c5cb4-fc5c-cdf4-8b99-ea9c7d43e2a9/diffs.json
+++ b/test/data/registry/us/sharedimages/4f0c5cb4-fc5c-cdf4-8b99-ea9c7d43e2a9/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/5009f994-4190-0386-ae59-7643eb3e2e61/diffs.json
+++ b/test/data/registry/us/sharedimages/5009f994-4190-0386-ae59-7643eb3e2e61/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/51f0d885-af80-5f47-6168-3eb731cd81e6/diffs.json
+++ b/test/data/registry/us/sharedimages/51f0d885-af80-5f47-6168-3eb731cd81e6/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/52785859-2c43-bfdb-3da7-8df81ca51a41/diffs.json
+++ b/test/data/registry/us/sharedimages/52785859-2c43-bfdb-3da7-8df81ca51a41/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/5b1517bc-8165-d91b-eda3-06692aa867c2/diffs.json
+++ b/test/data/registry/us/sharedimages/5b1517bc-8165-d91b-eda3-06692aa867c2/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/5c9749ed-9a5e-1676-2340-bb7dde262c34/diffs.json
+++ b/test/data/registry/us/sharedimages/5c9749ed-9a5e-1676-2340-bb7dde262c34/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/5feb1289-afba-113e-8602-7d8e1221ebd1/diffs.json
+++ b/test/data/registry/us/sharedimages/5feb1289-afba-113e-8602-7d8e1221ebd1/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/60aae8bd-4ac2-01e0-207a-f9e2e552841b/diffs.json
+++ b/test/data/registry/us/sharedimages/60aae8bd-4ac2-01e0-207a-f9e2e552841b/diffs.json
--- a/test/data/registry/us/sharedimages/6164d348-9e85-6c0f-9283-02050234ce41/diffs.json
+++ b/test/data/registry/us/sharedimages/6164d348-9e85-6c0f-9283-02050234ce41/diffs.json
--- a/test/data/registry/us/sharedimages/649be4bb-3077-f1ef-fdc4-99ce9d58a0d0/diffs.json
+++ b/test/data/registry/us/sharedimages/649be4bb-3077-f1ef-fdc4-99ce9d58a0d0/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/656537d8-8268-6198-9707-3d574a6da831/diffs.json
+++ b/test/data/registry/us/sharedimages/656537d8-8268-6198-9707-3d574a6da831/diffs.json
--- a/test/data/registry/us/sharedimages/6a5e472b-31d1-c466-fb7e-d21f0d56a2fa/diffs.json
+++ b/test/data/registry/us/sharedimages/6a5e472b-31d1-c466-fb7e-d21f0d56a2fa/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/6a787f8c-3cc9-b656-b7b0-988c54878741/diffs.json
+++ b/test/data/registry/us/sharedimages/6a787f8c-3cc9-b656-b7b0-988c54878741/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/6c92fcd0-2399-b83c-cb23-f3083f69e93f/diffs.json
+++ b/test/data/registry/us/sharedimages/6c92fcd0-2399-b83c-cb23-f3083f69e93f/diffs.json
--- a/test/data/registry/us/sharedimages/6f07844f-49df-64d3-f98b-33c7cebc11cf/diffs.json
+++ b/test/data/registry/us/sharedimages/6f07844f-49df-64d3-f98b-33c7cebc11cf/diffs.json
--- a/test/data/registry/us/sharedimages/7206842e-39b7-03e6-a160-ec7189b4f5af/diffs.json
+++ b/test/data/registry/us/sharedimages/7206842e-39b7-03e6-a160-ec7189b4f5af/diffs.json
--- a/test/data/registry/us/sharedimages/7246fa69-504e-dd0f-9e01-fbc7b6750782/diffs.json
+++ b/test/data/registry/us/sharedimages/7246fa69-504e-dd0f-9e01-fbc7b6750782/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/7642ccdb-a38d-f791-b35c-1ea5d7d51bac/diffs.json
+++ b/test/data/registry/us/sharedimages/7642ccdb-a38d-f791-b35c-1ea5d7d51bac/diffs.json
--- a/test/data/registry/us/sharedimages/76de5555-ca3c-7541-d445-e44722e18e35/diffs.json
+++ b/test/data/registry/us/sharedimages/76de5555-ca3c-7541-d445-e44722e18e35/diffs.json
--- a/test/data/registry/us/sharedimages/776b5474-2d25-a93b-0c45-f43bae515391/diffs.json
+++ b/test/data/registry/us/sharedimages/776b5474-2d25-a93b-0c45-f43bae515391/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/7d0aaf82-dee1-4874-e8fc-c27b0620af38/diffs.json
+++ b/test/data/registry/us/sharedimages/7d0aaf82-dee1-4874-e8fc-c27b0620af38/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/7d9e2b70-712b-6c47-c2f9-7a5af0987bc4/diffs.json
+++ b/test/data/registry/us/sharedimages/7d9e2b70-712b-6c47-c2f9-7a5af0987bc4/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/7ebb2eae-1ecf-7a46-ef6d-7401c16c6fcd/diffs.json
+++ b/test/data/registry/us/sharedimages/7ebb2eae-1ecf-7a46-ef6d-7401c16c6fcd/diffs.json
--- a/test/data/registry/us/sharedimages/7edd5d65-3e3e-c910-1e72-67e1e53b507d/diffs.json
+++ b/test/data/registry/us/sharedimages/7edd5d65-3e3e-c910-1e72-67e1e53b507d/diffs.json
--- a/test/data/registry/us/sharedimages/805ee0fa-984b-06f0-cf63-b7e1fb3b4087/diffs.json
+++ b/test/data/registry/us/sharedimages/805ee0fa-984b-06f0-cf63-b7e1fb3b4087/diffs.json
--- a/test/data/registry/us/sharedimages/8065077c-e099-9262-6d0d-ea7531b9c95e/diffs.json
+++ b/test/data/registry/us/sharedimages/8065077c-e099-9262-6d0d-ea7531b9c95e/diffs.json
@ -1,5 +0,0 @@
-{
-  "removed": [], 
-  "added": [], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/8640b956-8b19-d1dd-b5f6-3bca70212790/diffs.json
+++ b/test/data/registry/us/sharedimages/8640b956-8b19-d1dd-b5f6-3bca70212790/diffs.json
--- a/test/data/registry/us/sharedimages/8689de64-1b85-a1c5-586a-c2561ff5a8a2/diffs.json
+++ b/test/data/registry/us/sharedimages/8689de64-1b85-a1c5-586a-c2561ff5a8a2/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/88ab088d-8e16-5ffd-f9dd-31940e3657cc/diffs.json
+++ b/test/data/registry/us/sharedimages/88ab088d-8e16-5ffd-f9dd-31940e3657cc/diffs.json
@ -1,85 +0,0 @@
-{
-  "removed": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/890356b7-94fb-4f32-1e61-cde8072fe665/diffs.json
+++ b/test/data/registry/us/sharedimages/890356b7-94fb-4f32-1e61-cde8072fe665/diffs.json
--- a/test/data/registry/us/sharedimages/89566cc7-e357-137c-01b2-267bbe620ba1/diffs.json
+++ b/test/data/registry/us/sharedimages/89566cc7-e357-137c-01b2-267bbe620ba1/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/89b46e59-ce94-fbd5-f591-d9eaa5052b42/diffs.json
+++ b/test/data/registry/us/sharedimages/89b46e59-ce94-fbd5-f591-d9eaa5052b42/diffs.json
@ -1,7 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/elasticsearch-0.90.5.tar.gz"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/8d177179-0a84-edfd-51bd-257aff0ebe66/diffs.json
+++ b/test/data/registry/us/sharedimages/8d177179-0a84-edfd-51bd-257aff0ebe66/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/8d6f19d7-a257-dd68-ac6c-3b7e47467752/diffs.json
+++ b/test/data/registry/us/sharedimages/8d6f19d7-a257-dd68-ac6c-3b7e47467752/diffs.json
--- a/test/data/registry/us/sharedimages/8dbd7ccc-692d-6113-282b-0939f1798f6e/diffs.json
+++ b/test/data/registry/us/sharedimages/8dbd7ccc-692d-6113-282b-0939f1798f6e/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/test/data/registry/us/sharedimages/8de22bda-e0bc-fee1-7a4b-54c46ccca70a/diffs.json
+++ b/test/data/registry/us/sharedimages/8de22bda-e0bc-fee1-7a4b-54c46ccca70a/diffs.json
--- a/test/data/registry/us/sharedimages/929d4928-0a9a-ab5e-6aa2-fe9420cc918a/diffs.json
+++ b/test/data/registry/us/sharedimages/929d4928-0a9a-ab5e-6aa2-fe9420cc918a/diffs.json
@ -1,8 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/934caf90-6a23-4a62-9d0a-5004c3dcb2e7/diffs.json
+++ b/test/data/registry/us/sharedimages/934caf90-6a23-4a62-9d0a-5004c3dcb2e7/diffs.json
@ -1,45 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "changed": []
-}
--- a/test/data/registry/us/sharedimages/947f3141-f954-359f-8487-243f8e86ffa0/diffs.json
+++ b/test/data/registry/us/sharedimages/947f3141-f954-359f-8487-243f8e86ffa0/diffs.json
@ -1,38 +0,0 @@
-{
-  "removed": [], 
-  "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-  ], 
-  "changed": [
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
-}
--- a/Show more
+++ b/Show more