Skip to content

Commit

Permalink
update to main
Browse files Browse the repository at this point in the history
  • Loading branch information
ourboy committed Aug 27, 2021
1 parent 80e3a15 commit c5a181c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .bulldozer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ merge:
trigger:
labels: ["merge when ready"]
comment_substrings: ["==AUTOMERGE==", "==MERGE_WHEN_READY=="]
branches: ["master"]
branches: ["main"]
branch_patterns: ["epic/.*"]
ignore:
labels: ["do not merge"]
Expand All @@ -15,5 +15,5 @@ merge:
update:
trigger:
labels: ["wip", "update me"]
branches: ["master"]
branches: ["main"]
branch_patterns: ["epic/.*"]
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ deploy:
committer_from_gh: true
target_branch: gh-pages
on:
branch: master
branch: main
2 changes: 1 addition & 1 deletion src/pages/contributing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is a guide for contributing to the SPM DevOps runbook.

| Branch | Status |
|:-:|:-:|
| _Master_ | [![Build Status](https://travis-ci.com/IBM/spm-kubernetes.svg?branch=master)](https://app.travis-ci.com/IBM/spm-kubernetes) |
| _Main_ | [![Build Status](https://travis-ci.com/IBM/spm-kubernetes.svg?branch=main)](https://app.travis-ci.com/IBM/spm-kubernetes) |

## House Rules

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Monitoring performance using JMX statistics

Cúram JMX statistics provides operational data from a running IBM® Cúram Social Program Management (SPM) application.
JMX statistics for use with a traditional application server are documented
in this [IBM Documentation](https://www.ibm.com/docs/en/spm/8.0.0?topic=application-configuring-jmx-statistics) page.
in this [IBM Documentation](https://www.ibm.com/docs/en/spm/8.0.0?topic=management-configuring-jmx-statistics) page.

### Cúram JMX Kubernetes Limitations

Expand Down

0 comments on commit c5a181c

Please sign in to comment.