Merge a0dcc18 into 3520fa7

aviator · Jun 4, 2014 · 5748b68 · 5748b68
2 parents 3520fa7 + a0dcc18
commit 5748b68
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/...ata_item/leads_to_a_valid_response_when_valid_server_id_and_metadata_key_are_provided.yml b/...ata_item/leads_to_a_valid_response_when_valid_server_id_and_metadata_key_are_provided.yml
diff --git a/.../public/list_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml b/.../public/list_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml
diff --git a/...ublic/list_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml b/...ublic/list_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml
diff --git a/...2/public/set_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml b/...2/public/set_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml
diff --git a/...public/set_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml b/...public/set_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml
diff --git a/...ublic/update_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml b/...ublic/update_image_metadata/leads_to_a_valid_response_when_valid_image_id_is_provided.yml
diff --git a/...lic/update_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml b/...lic/update_server_metadata/leads_to_a_valid_response_when_valid_server_id_is_provided.yml