Merge branch 'master' into 2.x

Author: jnioche

core/src/main/java/com/digitalpebble/stormcrawler/protocol/selenium/RemoteDriverProtocol.java

@@ -86,7 +86,7 @@ public void configure(Config conf) {
                     int implicitWait = ConfUtils.getInt(conf,
                             "selenium.implicitlyWait", 0);
                     int pageLoadTimeout = ConfUtils.getInt(conf,
-                            "selenium.pageLoadTimeout", -1);
+                            "selenium.pageLoadTimeout", 0);
                     int setScriptTimeout = ConfUtils.getInt(conf,
                             "selenium.setScriptTimeout", 0);
                     touts.implicitlyWait(implicitWait, TimeUnit.MILLISECONDS);

external/elasticsearch/src/main/java/com/digitalpebble/stormcrawler/elasticsearch/metrics/MetricsConsumer.java

@@ -134,10 +134,11 @@ private void handleDataPoints(final TaskInfo taskInfo,
      * @return elastic index name
      */
     private String getIndexName(Date timestamp) {
+        if (dateFormat == null)
+            return indexName;
+
         StringBuilder sb = new StringBuilder(indexName);
-        if (dateFormat != null) {
-            sb.append("-").append(dateFormat.format(timestamp));
-        }
+        sb.append("-").append(dateFormat.format(timestamp));
         return sb.toString();
     }