Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into transaction_ignor…
Browse files Browse the repository at this point in the history
…e_urls

* upstream/master:
  [CI] compare with the calculated SHA commit (elastic#336)
  add link to PHP documentation
  Link to create-agent-issues.sh in spec process
  • Loading branch information
v1v committed Sep 3, 2020
2 parents 73bc500 + c51d008 commit fdfe737
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ pipeline {
]
env.GHERKIN_SPECS_UPDATED = isGitRegionMatch(
from: "${env.GIT_PREVIOUS_SUCCESSFUL_COMMIT}",
to: "${env.GIT_COMMIT}",
patterns: regexps)

// regexp for JSON specs
Expand All @@ -90,7 +89,6 @@ pipeline {
]
env.JSON_SPECS_UPDATED = isGitRegionMatch(
from: "${env.GIT_PREVIOUS_SUCCESSFUL_COMMIT}",
to: "${env.GIT_COMMIT}",
patterns: regexps)
}
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
| Java Agent | [apm-agent-java][] | [📘 elastic.co][apm-agent-java-docs] | [📂 contrib][apm-agent-java-contrib]
| JavaScript RUM Agent | [apm-agent-rum-js][] | [📘 elastic.co][apm-agent-js-base-docs] | [📂 contrib][apm-agent-rum-js-contrib]
| Node.js Agent | [apm-agent-nodejs][] | [📘 elastic.co][apm-agent-nodejs-docs] | [📂 contrib][apm-agent-nodejs-contrib]
| PHP Agent | [apm-agent-php][] | elastic.co - TBD | [📂 contrib][apm-agent-php-contrib]
| PHP Agent | [apm-agent-php][] | [📘 elastic.co][apm-agent-php-docs] | [📂 contrib][apm-agent-php-contrib]
| Python Agent | [apm-agent-python][] | [📘 elastic.co][apm-agent-python-docs] | [📂 contrib][apm-agent-python-contrib]
| Ruby Agent | [apm-agent-ruby][] | [📘 elastic.co][apm-agent-ruby-docs] | [📂 contrib][apm-agent-ruby-contrib]
| .NET Agent | [apm-agent-dotnet][] | [📘 elastic.co][apm-agent-dotnet-docs] | [📂 contrib][apm-agent-dotnet-contrib]
Expand Down
1 change: 1 addition & 0 deletions specs/agents/process-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Every change that affects more than one agent should be initiated via a PR again
They make sure the issues are assigned to a stack release milestone,
based on the milestone of the agent table.
The table should be amended to include the link to all the implementation issues.
The [`create-agent-issues.sh`](../../scripts/create-agent-issues.sh) script is your friend here.
This makes it easier to see the current implementation state for each agent and makes it easy to verify that there's an issue for each agent.
Agent teams can still change the milestone if priorities shift.
However, they should let their team lead know.
Expand Down

0 comments on commit fdfe737

Please sign in to comment.