public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs: Backport 32916 to v7.5x (#33008)

Browse Source 
* fixing things

* Update add-authentication-for-data-source-plugins.md

* Docs: Sync release branch with latest docs (#32986)

* Docs: Sync release branch with latest docs

* Fixed what branch to update

* Elasticsearch: Force re-rendering of each editor row type change (#32993) (#32996)

(cherry picked from commit 136460d369)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>

* ReleaseNotes: Updated changelog and release notes for 7.5.4 (#32973) (#32998)

* ReleaseNotes: Updated changelog and release notes for 7.5.4 (#32973)

* ReleaseNotes: Updated changelog and release notes for 7.5.4

* Update index link

* Fix boldness

* Update CHANGELOG.md

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

* Update codespell words

* Update docs/sources/release-notes/release-notes-7-5-4.md

* Update CHANGELOG.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/release-notes/release-notes-7-5-4.md

* Change bold markers

* Fix escaping

* Update drone yaml

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit a516ff00db)

* Add old release notes

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>

* fixing things

* Merge branch 'v7.5.x' of https://github.com/grafana/grafana into backport-32916-to-v7.5.x

* Update add-authentication-for-data-source-plugins.md

* Update license-restrictions.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
This commit is contained in:
Torkel Ödegaard
2021-04-14 15:40:43 -07:00
committed by GitHub
co-authored by Grot Diana Payton Giordano Ricci Andrej Ocenas
parent f6268bc37a
commit 8011ff4f79
19 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/http_api/admin.md
+1 -1
View File
@@ -225,7 +225,7 @@ Content-Type: application/json
}
```
Note that `OrgId` is an optional parameter that can be used to assign a new user to a different organization when [auto_assign_org](https://grafana.com/docs/grafana/latest/administration/configuration/#auto-assign-org) is set to `true`.
Note that `OrgId` is an optional parameter that can be used to assign a new user to a different organization when [auto_assign_org]({{< relref "../administration/configuration.md#auto-assign-org" >}}) is set to `true`.
**Example Response**: