Merge pull request #763 from shintasmith/rm_enums

follow up removal of all things enum in contrib/ dir
rax-maas · Dec 7, 2016 · b15bf5d · b15bf5d
2 parents 0e56949 + 13072a0
commit b15bf5d
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 1,151 deletions.
diff --git a/...rc/main/java/com/rackspacecloud/blueflood/outputs/handlers/HttpMetricDataQueryServer.java b/...rc/main/java/com/rackspacecloud/blueflood/outputs/handlers/HttpMetricDataQueryServer.java
@@ -106,7 +106,7 @@ private void setupPipeline(SocketChannel channel, RouteMatcher router) {
             public void exceptionCaught(ChannelHandlerContext ctx, Throwable thr) throws Exception {
                 try {
                     if (ctx.channel().isWritable()) {
-                        log.debug("request decoder error " + thr.getCause().toString() + " on channel " + ctx.channel().toString());
+                        log.debug("request decoder error " + thr.getCause() + " on channel " + ctx.channel().toString());
                         ctx.channel().write(
                                 new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.BAD_REQUEST))
                                             .addListener(ChannelFutureListener.CLOSE);

diff --git a/build_and_release.rb b/build_and_release.rb
diff --git a/contrib/blueflood-docker/Dockerfile b/contrib/blueflood-docker/Dockerfile
@@ -46,7 +46,6 @@ ENV INGESTION_MODULES=com.rackspacecloud.blueflood.service.HttpIngestionService
 ENV QUERY_MODULES=com.rackspacecloud.blueflood.service.HttpQueryService
 ENV DISCOVERY_MODULES=com.rackspacecloud.blueflood.io.ElasticIO
 ENV EVENTS_MODULES=com.rackspacecloud.blueflood.io.EventElasticSearchIO
-ENV ENUMS_DISCOVERY_MODULES=com.rackspacecloud.blueflood.io.EnumElasticIO
 
 ENV ZOOKEEPER_CLUSTER=NONE
 

diff --git a/contrib/enum_metrics/MANIFEST.in b/contrib/enum_metrics/MANIFEST.in
diff --git a/contrib/enum_metrics/README.md b/contrib/enum_metrics/README.md
diff --git a/contrib/enum_metrics/config.ini b/contrib/enum_metrics/config.ini
diff --git a/contrib/enum_metrics/enum_metrics/__init__.py b/contrib/enum_metrics/enum_metrics/__init__.py
diff --git a/contrib/enum_metrics/enum_metrics/config.py b/contrib/enum_metrics/enum_metrics/config.py