ExpediaDotCom / haystack-ui

74%

master: 78%

LAST BUILD ON BRANCH os-merge

branch: os-merge

CHANGE BRANCH

x

Reset

• os-merge
• 1.0.4
• 1.1.5
• 1.1.6
• 1.1.7
• 1.1.8
• 500-error
• TECHX-940c
• TECHX-951
• TECHX-972
• TECHX-976
• absrivastava-patch-1
• alert-fixes
• alert-wording-fix
• blob-fix
• blobkey
• blobs
• bugfix
• clear-search
• dev_kpeswani
• docker-build-fix
• docker-fix
• download-fix
• download-trace
• duplicate-nested-key
• duplicate-spanids
• duration-key-improvements
• external-linking
• fix-service-name-check
• guide-history
• heatmap
• heatmapfinal
• heatmapfix
• help-page
• hotfix-2
• jbuli-merge
• keshavpeswani-patch-1
• l5dLabel
• linking-bug-fix
• lk
• lockFix
• master
• master-1.0.3-lw
• merge-service-insights-from-os
• metrictank-tag-query
• minor-fixes
• mt-updates
• nested-key-changes
• not-operator
• npm-audit
• npmrc
• ns-haystack-dropdown
• ns_issue_related_traces
• ns_saveTrace
• ns_save_trace
• ns_save_trace_ui
• ns_test
• nsahai8-patch-1
• opensource-merge
• operation-fetch
• osspullzoom
• override-changes
• pr/498
• prettier
• pruning
• range-operators
• raw-trace-fix
• react-upgrades
• rq-bug-fix
• search-bar-updates
• search-fix
• search-fixes
• searching-bug-fixes
• service-insight-fixes
• service-insights
• service-insights-performance
• service-insights-preview
• show_field_values
• si-fixes
• si-relationship-tab-fix
• si-tab-fix
• spans-view-fix
• spans-view-patch
• stage
• tab-fix
• tag-fix
• time-format-fix
• timeline-fixes
• timeline-sort-fix
• timezone-display
• trace-details-optimizations
• trace-upload
• traceId-fix
• trend-connector-coverage
• typo-fix
• upload-trace-fix
• upstream-1.0.4
• usb-fixes
• version-upgrades
• whitelisted-key-fix
• wording-fix
• zipkin-fixes
• zoomFeature

merge in OS bug fixes and resolve conflicts