[2/5] storm git commit: STORM-851: Storm Solr Connector 1. Address code review README.md Javadocs Apache Copyright 2. Fixed Multivalue fields bug

[sr...@apache.org]

http://git-wip-us.apache.org/repos/asf/storm/blob/8552f43c/external/storm-solr/src/test/java/org/apache/storm/solr/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/test/java/org/apache/storm/solr/util/TestUtil.java b/external/storm-solr/src/test/java/org/apache/storm/solr/util/TestUtil.java
index 66bc4e6..84a866b 100644
--- a/external/storm-solr/src/test/java/org/apache/storm/solr/util/TestUtil.java
+++ b/external/storm-solr/src/test/java/org/apache/storm/solr/util/TestUtil.java
@@ -1,17 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.storm.solr.util;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-/**
- * Created by hlouro on 7/31/15.
- */
 public class TestUtil {
     public static String getDate() {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-        String date = df.format(new Date());
-        System.out.println(date);
-        return date;
+        return df.format(new Date());
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/8552f43c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c2b73bc..9c86ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,12 +169,9 @@
         <module>external/storm-redis</module>
         <module>external/storm-eventhubs</module>
         <module>external/flux</module>
-<<<<<<< HEAD
-        <module>examples/storm-starter</module>
         <module>external/storm-elasticsearch</module>
-=======
         <module>external/storm-solr</module>
->>>>>>> STORM-851: Storm Solr Connector
+        <module>examples/storm-starter</module>
     </modules>
 
     <scm>