Projects >> helix >>619b6a3fd0ee080b888ed3df37c6aa1570bea5ec

Chunk
Conflicting content 
   * @return
   */
  ClusterManagementService getClusterManagmentTool();
<<<<<<< HEAD
  
   PropertyStore getPropertyStore(String rootNamespace, PropertySerializer serializer);
=======
  /**
   * Messaging service which can be used to send cluster wide messages.
   * 
   */
  ClusterMessagingService getMessagingService();

>>>>>>> 9f0b5eafffcc66a3b0a635febf59fe38c12a7e1a
}
Solution content 
   * @return
   */
  ClusterManagementService getClusterManagmentTool();

  /**
   * Provide get property store for a cluster
   * @param rootNamespace
   * @param serializer
   * @return
   */
   PropertyStore getPropertyStore(String rootNamespace, PropertySerializer serializer);

  /**
   * Messaging service which can be used to send cluster wide messages.
   * 
   */
  ClusterMessagingService getMessagingService();
}
File
ClusterManager.java
Developer's decision
Manual
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    return _mgmtTool;
  }

<<<<<<< HEAD
  @Override
  public  PropertyStore getPropertyStore(String rootNamespace,
                                               PropertySerializer serializer)
  {
    // TODO Auto-generated method stub
    return null;
=======
	@Override
  public ClusterMessagingService getMessagingService()
  {
	  // TODO Auto-generated method stub
	  return null;
>>>>>>> 9f0b5eafffcc66a3b0a635febf59fe38c12a7e1a
  }

}
Solution content 
    return _mgmtTool;
  }

  @Override
  public  PropertyStore getPropertyStore(String rootNamespace,
                                               PropertySerializer serializer)
  {
    // TODO Auto-generated method stub
    return null;
  }
  
  @Override
  public ClusterMessagingService getMessagingService()
  {
	  // TODO Auto-generated method stub
	  return null;
  }

}
File
DynamicFileClusterManager.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Comment
Method signature
Return statement
Chunk
Conflicting content 
    return null;
  }

<<<<<<< HEAD
  @Override
  public  PropertyStore getPropertyStore(String rootNamespace,
                                               PropertySerializer serializer)
  {
    // TODO Auto-generated method stub
    return null;
=======
	@Override
  public ClusterMessagingService getMessagingService()
  {
	  // TODO Auto-generated method stub
	  return null;
>>>>>>> 9f0b5eafffcc66a3b0a635febf59fe38c12a7e1a
  }

}
Solution content 
    return null;
  }

  @Override
  public  PropertyStore getPropertyStore(String rootNamespace,
                                               PropertySerializer serializer)
  {
    // TODO Auto-generated method stub
    return null;
  }
  
  @Override
  public ClusterMessagingService getMessagingService()
  {
	  // TODO Auto-generated method stub
	  return null;
  }

}
File
FileBasedClusterManager.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Comment
Method signature
Return statement
Chunk
Conflicting content 
      return null;
    }

<<<<<<< HEAD
    @Override
    public  PropertyStore getPropertyStore(String rootNamespace,
                                                 PropertySerializer serializer)
    {
      // TODO Auto-generated method stub
      return null;
=======
		@Override
    public ClusterMessagingService getMessagingService()
    {
	    // TODO Auto-generated method stub
	    return null;
>>>>>>> 9f0b5eafffcc66a3b0a635febf59fe38c12a7e1a
    }

	}
Solution content 
      return null;
    }
	
    @Override
    public ClusterMessagingService getMessagingService()
    {
	    // TODO Auto-generated method stub
	    return null;
    }
	}
File
Mocks.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method signature
Return statement