Projects >> eucalyptus >>7518967c1dfea5311715ccd8154dbaae171dcc5c

Chunk
Conflicting content 
			}
		}

<<<<<<< HEAD
		if(false) { //WalrusProperties.enableVirtualHosting) {
			if(checkDNSNaming(bucketName)) {
				UpdateARecordType updateARecord = new UpdateARecordType();
				updateARecord.setUserId(account.getAccountNumber());
				URI walrusUri;
				String address = null;
				try {
					walrusUri = new URI(SystemConfiguration.getWalrusUrl());
					address = walrusUri.getHost();
				} catch (URISyntaxException e) {
					throw new EucalyptusCloudException("Could not get Walrus URL");
				}
				String zone = WalrusProperties.WALRUS_SUBDOMAIN + ".";
				updateARecord.setAddress(address);
				updateARecord.setName(bucketName + "." + zone);
				updateARecord.setTtl(604800);
				updateARecord.setZone(zone);
				try {
					ServiceDispatcher.lookupSingle(Components.lookup(Dns.class)).send(updateARecord);
					LOG.info("Mapping " + updateARecord.getName() + " to " + address);
				} catch(Exception ex) {
					LOG.error("Could not update DNS record", ex);
				}
			} else {
				LOG.error("Bucket: " + bucketName + " fails to meet DNS requirements. Unable to create DNS mapping.");
			}
		}

=======
>>>>>>> e5ff9a155898d47209d88053d52264b8f8a07ec6
		reply.setBucket(bucketName);
		return reply;
	}
Solution content 
			}
		}

		reply.setBucket(bucketName);
		return reply;
	}
File
WalrusManager.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
								LOG.error(ex);
							}

<<<<<<< HEAD
							if (false) { //WalrusProperties.enableVirtualHosting) {
								URI walrusUri;
								String address;
								RemoveARecordType removeARecordType = new RemoveARecordType();
								removeARecordType.setUserId(account.getAccountNumber());
								String zone = WalrusProperties.WALRUS_SUBDOMAIN + ".";
								removeARecordType.setName(bucketName + "." + zone);
								removeARecordType.setZone(zone);
								try {
									walrusUri = new URI(SystemConfiguration.getWalrusUrl());
									address = walrusUri.getHost();
								} catch (URISyntaxException e) {
									db.rollback();
									throw new EucalyptusCloudException("Could not get Walrus URL");
								}
								removeARecordType.setAddress(address);
								try {
									ServiceDispatcher.lookupSingle(Components.lookup(Dns.class)).send(
											removeARecordType);
									LOG.info("Removing mapping for "
											+ removeARecordType.getName());
								} catch (Exception ex) {
									LOG.error("Could not update DNS record", ex);
								}
							}

=======
>>>>>>> e5ff9a155898d47209d88053d52264b8f8a07ec6
							Status status = new Status();
							status.setCode(204);
							status.setDescription("No Content");
Solution content 
								LOG.error(ex);
							}

							Status status = new Status();
							status.setCode(204);
							status.setDescription("No Content");
File
WalrusManager.java
Developer's decision
Version 2
Kind of conflict
If statement