Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add missing breaks to switch cases in ElasticSearch::HTTPReceive().

CHANGES

@@ -1,4 +1,9 @@
 
+2.0-907 | 2012-07-30 09:13:36 -0700
+
+  * Add missing breaks to switch cases in
+    ElasticSearch::HTTPReceive(). (Jon Siwek)
+
 2.0-905 | 2012-07-28 16:24:34 -0700
 
   * Fix log manager hanging on waiting for pending file rotations,

VERSION

@@ -1 +1 @@
-2.0-905
+2.0-907

src/logging/writers/ElasticSearch.cc

@@ -384,12 +384,16 @@ bool ElasticSearch::HTTPSend(CURL *handle)
 			{
 			if ( ! failing )
 				Error(Fmt("ElasticSearch server may not be accessible."));
+
+			break;
 			}
 
 		case CURLE_OPERATION_TIMEDOUT:
 			{
 			if ( ! failing )
 				Warning(Fmt("HTTP operation with elasticsearch server timed out at %" PRIu64 " msecs.", transfer_timeout));
+
+			break;
 			}
 
 		case CURLE_OK:
@@ -401,10 +405,13 @@ bool ElasticSearch::HTTPSend(CURL *handle)
 				return true;
 			else if ( ! failing )
 				Error(Fmt("Received a non-successful status code back from ElasticSearch server, check the elasticsearch server log."));
+
+			break;
 			}
 
 		default:
 			{
+			break;
 			}
 		}
 		// The "successful" return happens above