Wording tweak; undo commented-out CI test

benhoyt · Jun 28, 2023 · 7561a98 · 7561a98
1 parent 31926c4
commit 7561a98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/observability-charm-tests.yaml b/.github/workflows/observability-charm-tests.yaml
@@ -12,8 +12,7 @@ jobs:
         charm-repo:
           - "canonical/alertmanager-k8s-operator"
           - "canonical/prometheus-k8s-operator"
-# TODO(benhoyt): uncomment when https://github.com/canonical/grafana-k8s-operator/pull/223 is fixed
-#          - "canonical/grafana-k8s-operator"
+          - "canonical/grafana-k8s-operator"
 
     steps:
       - name: Checkout the ${{ matrix.charm-repo }} repository

diff --git a/ops/pebble.py b/ops/pebble.py
@@ -2192,7 +2192,7 @@ def exec(
             command: Command to execute: the first item is the name (or path)
                 of the executable, the rest of the items are the arguments.
             context: If specified, run the command in the context of this
-                service, that is, inherit its environment variables,
+                service. Specifically, inherit its environment variables,
                 user/group settings, and working directory. The other exec
                 options will override the service context; ``environment``
                 will be merged on top of the service's.