github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.9' into develop 

# Conflicts:
#	api/http/handler/websocket/shell_pod.go
#	app/portainer/components/box-selector/box-selector-item/box-selector-item.html
#	app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
#	app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html
#	app/portainer/settings/authentication/ldap/index.js
#	app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html
#	app/portainer/settings/authentication/ldap/ldap-settings.model.js
#	app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js
#	app/portainer/views/settings/authentication/settingsAuthenticationController.js
pull/5975/head
Simon Meng 2021-10-26 10:58:19 +13:00
parent 32756f9e1b 40a6645e23
commit db00390cd2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/handler.go
View File

@ -74,7 +74,7 @@ type Handler struct {
} }
// @title PortainerCE API // @title PortainerCE API
// @version 2.9.1 // @version 2.9.2
// @description.markdown api-description.md // @description.markdown api-description.md
// @termsOfService // @termsOfService

2
api/portainer.go
View File

@ -1470,7 +1470,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API // APIVersion is the version number of the Portainer API
APIVersion = "2.9.1" APIVersion = "2.9.2"
// DBVersion is the version number of the Portainer database // DBVersion is the version number of the Portainer database
DBVersion = 33 DBVersion = 33
// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax // ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Portainer.io", "author": "Portainer.io",
"name": "portainer", "name": "portainer",
"homepage": "http://portainer.io", "homepage": "http://portainer.io",
"version": "2.9.1", "version": "2.9.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"