merge

cat-consumer/pom.xml

@@ -31,7 +31,11 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
+<<<<<<< HEAD
 				<version>1.0.10</version>
+=======
+				<version>1.0.9</version>
+>>>>>>> 31515b8c1b82963a28412ab90fbd3229ea890f3f
 				<executions>
 					<execution>
 						<id>generate failure report model</id>

cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java

@@ -23,11 +23,14 @@ public interface MessageStorage {
 	 */
 	public MessageTree get(String messageId);
 
-	/*
+	/**
 	 * Get relative path to base directory or base URL.
 	 * 
 	 * @param tree
 	 * 
+	 * Get relative path to base directory or base URL.
+	 * 
+	 * @param tree
 	 * @return relative path to base directory or base URL
 	 */
 	public String getPath(MessageTree tree);