Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.4](backport #3476) [apm docs consolidation] Clean up #3487

Merged
merged 4 commits into from
Jan 2, 2024

Commits on Dec 21, 2023

  1. [apm docs consolidation] Clean up (#3476)

    * use tagged regions for release notes
    
    * rename apm-breaking, point to apm-server
    
    * remove data and spec directories, point to apm-server
    
    (cherry picked from commit d4309b5)
    
    # Conflicts:
    #	docs/en/apm-server/apm-breaking.asciidoc
    #	docs/en/apm-server/data-model.asciidoc
    #	docs/en/apm-server/data/elasticsearch/generated/errors.json
    #	docs/en/apm-server/data/elasticsearch/generated/spans.json
    #	docs/en/apm-server/data/elasticsearch/generated/transactions.json
    #	docs/en/apm-server/data/elasticsearch/metricset.json
    #	docs/en/apm-server/release-notes.asciidoc
    #	docs/en/apm-server/spec/rumv3/error.json
    #	docs/en/apm-server/spec/rumv3/span.json
    #	docs/en/apm-server/spec/rumv3/transaction.json
    #	docs/en/apm-server/spec/v2/error.json
    #	docs/en/apm-server/spec/v2/metadata.json
    #	docs/en/apm-server/spec/v2/span.json
    #	docs/en/apm-server/spec/v2/transaction.json
    colleenmcginnis authored and mergify[bot] committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    eddf5c0 View commit details
    Browse the repository at this point in the history
  2. fix conflicts

    colleenmcginnis committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    0e2fb06 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. fix build errors

    colleenmcginnis committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    1960044 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c9066ce View commit details
    Browse the repository at this point in the history