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

Merge branch 'release/1.11.3'

pull/445/merge
Anthony Lapenna 2017-02-01 11:02:10 +13:00
parent 7afeb8a80d a97e7bbaae
commit 5d63c90203
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/cli/defaults_windows.go
View File

@ -2,11 +2,11 @@ package cli
const ( const (
defaultBindAddress = ":9000" defaultBindAddress = ":9000"
defaultDataDirectory = "C:\\ProgramData\\Portainer" defaultDataDirectory = "C:\\data"
defaultAssetsDirectory = "." defaultAssetsDirectory = "."
defaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json" defaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
defaultTLSVerify = "false" defaultTLSVerify = "false"
defaultTLSCACertPath = "C:\\ProgramData\\Portainer\\certs\\ca.pem" defaultTLSCACertPath = "C:\\certs\\ca.pem"
defaultTLSCertPath = "C:\\ProgramData\\Portainer\\certs\\cert.pem" defaultTLSCertPath = "C:\\certs\\cert.pem"
defaultTLSKeyPath = "C:\\ProgramData\\Portainer\\certs\\key.pem" defaultTLSKeyPath = "C:\\certs\\key.pem"
) )

2
api/portainer.go
View File

@ -119,7 +119,7 @@ type (
const ( const (
// APIVersion is the version number of portainer API. // APIVersion is the version number of portainer API.
APIVersion = "1.11.2" APIVersion = "1.11.3"
) )
const ( const (

2
app/app.js
View File

@ -568,4 +568,4 @@ angular.module('portainer', [
.constant('ENDPOINTS_ENDPOINT', 'api/endpoints') .constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
.constant('TEMPLATES_ENDPOINT', 'api/templates') .constant('TEMPLATES_ENDPOINT', 'api/templates')
.constant('PAGINATION_MAX_ITEMS', 10) .constant('PAGINATION_MAX_ITEMS', 10)
.constant('UI_VERSION', 'v1.11.2'); .constant('UI_VERSION', 'v1.11.3');

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "portainer", "name": "portainer",
"version": "1.11.2", "version": "1.11.3",
"homepage": "https://github.com/portainer/portainer", "homepage": "https://github.com/portainer/portainer",
"authors": [ "authors": [
"Anthony Lapenna <anthony.lapenna at gmail dot com>" "Anthony Lapenna <anthony.lapenna at gmail dot com>"

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": "1.11.2", "version": "1.11.3",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"