Merge 2d6f52d into e576ab5

jaegertracing · Nov 20, 2017 · 393f22e · 393f22e
2 parents e576ab5 + 2d6f52d
commit 393f22e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker-compose/jaeger-docker-compose.yml b/docker-compose/jaeger-docker-compose.yml
@@ -9,7 +9,7 @@ services:
         - "14268:14268"
         - "14267"
         - "9411:9411"
-      restart: on-failure
+      restart: on-failure:20
       depends_on:
         - cassandra-schema
 
@@ -19,7 +19,7 @@ services:
       ports:
         - "16686:16686"
         - "16687"
-      restart: on-failure
+      restart: on-failure:20
       depends_on:
         - cassandra-schema
 
@@ -31,7 +31,7 @@ services:
         - "6831:6831/udp"
         - "6832:6832/udp"
         - "5778:5778"
-      restart: on-failure
+      restart: on-failure:20
       depends_on:
         - jaeger-collector
 

diff --git a/jaeger-ui b/jaeger-ui
+1 −11		CHANGELOG.md
+1 −3		README.md
+3 −4		package.json
+1 −1		scripts/check-license.sh
+17 −11		src/components/App/App.css
+15 −9		src/components/App/Page.css
+2 −3		src/components/App/Page.js
+15 −9		src/components/App/TopNav.css
+1 −1		src/components/App/index.js
+15 −9		src/components/DependencyGraph/DependencyGraph.css
+15 −9		src/components/SearchTracePage/TraceResultsScatterPlot.css
+3 −15		src/components/SearchTracePage/TraceSearchForm.js
+15 −9		src/components/SearchTracePage/TraceSearchResult.css
+29 −54		src/components/SearchTracePage/index.js
+1 −1		src/components/TracePage/ScrollManager.js
+15 −9		src/components/TracePage/SpanGraph/CanvasSpanGraph.css
+15 −9		src/components/TracePage/SpanGraph/GraphTicks.css
+17 −11		src/components/TracePage/SpanGraph/Scrubber.css
+15 −9		src/components/TracePage/SpanGraph/TickLabels.css
+15 −9		src/components/TracePage/SpanGraph/ViewingLayer.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanBar.css
+17 −11		src/components/TracePage/TraceTimelineViewer/SpanBarRow.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanDetail/AccordianKeyValues.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanDetail/AccordianLogs.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanDetail/KeyValuesTable.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanDetail/index.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanDetailRow.css
+15 −9		src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.css
+15 −9		src/components/TracePage/TraceTimelineViewer/Ticks.css
+17 −11		src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.css
+15 −9		src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.css
+15 −9		src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.css
+15 −9		src/components/TracePage/TraceTimelineViewer/TimelineRow.css
+15 −9		src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.css
+15 −9		src/components/TracePage/TraceTimelineViewer/grid.css
+15 −9		src/components/TracePage/TraceTimelineViewer/index.css
+15 −9		src/components/TracePage/index.css
+6 −5		src/reducers/services.js
+9 −18		src/reducers/services.test.js
+0 −60		src/selectors/trace.fixture.js
+1 −1		src/selectors/trace.js
+10 −17		src/selectors/trace.test.js
+0 −309		src/utils/DraggableManager/README.md
+0 −44		src/utils/DraggableManager/demo/DividerDemo.css
+0 −84		src/utils/DraggableManager/demo/DividerDemo.js
+0 −31		src/utils/DraggableManager/demo/DraggableManagerDemo.css
+0 −84		src/utils/DraggableManager/demo/DraggableManagerDemo.js
+0 −38		src/utils/DraggableManager/demo/RegionDemo.css
+0 −119		src/utils/DraggableManager/demo/RegionDemo.js
+ −		src/utils/DraggableManager/demo/demo-ux.gif
+0 −17		src/utils/DraggableManager/demo/index.js
+1 −1		src/utils/configure-store.js
+1 −1		src/utils/configure-store.test.js
+15 −2		yarn.lock