Permalink
Browse files

merge conflicts resolved

  • Loading branch information...
2 parents a57f172 + 31043d1 commit a9e760079e6e6a957da427c2baa78513673e267a @zmalik zmalik committed Apr 25, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 api/src/main/java/com/abiquo/api/exceptions/APIError.java
@@ -617,7 +617,7 @@
"CHEF-5", "The node could not be updated on the Chef Server. "
+ "Please contact the Administrator."), CHEF_CANNOT_CONNECT("CHEF-6",
"Could not connect to the Chef server. Please contact the Administrator."), CHEF_INVALID_ENTERPRISE_DATA(
- "CHEF-7", "Could not connect to the Chef server with the given Validator and Admin data. "
+ "CHEF-7", "Could not connect to the Chef server with the given Admin data. "
+ "Please verify the credentials"), CHEF_INVALID_ENTERPRISE("CHEF-8",
"The enterprise is not configured to use Chef"), CHEF_INVALID_VIRTUALMACHINE("CHEF-9",
"The virtual machine cannot use Chef. "
@@ -626,7 +626,9 @@
"The validator certificate supplied is not a valid private key. Please verify the key format."), CHEF_INVALID_CLIENT_KEY(
"CHEF-11",
"The provided admin certificate is not a valid private key. Please verify the key format."), CHEF_MALFORMED_URL(
- "CHEF-12", "The provided chef server URL is not well formed."),
+ "CHEF-12", "The provided chef server URL is not well formed."), CHEF_CLIENT_DOES_NOT_EXIST(
+ "CHEF-13", "The validator client supplied does not exist"),
+
// Parsing links
LINKS_INVALID_LINK("LNK-0", "Invalid link. Check documentation"), LINKS_ONLY_ACCEPTS_ONE_LINK(
"LNK-1", "Invalid number of links: This resource only accepts a single link"), LINKS_VIRTUAL_MACHINE_TEMPLATE_NOT_FOUND(

0 comments on commit a9e7600

Please sign in to comment.