Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brad Rydzewski 2019-04-10 16:30:25 -07:00
commit adc110be17
2 changed files with 22 additions and 5 deletions

15
LICENSE
View File

@ -59,6 +59,8 @@ legal claim.**
-----------------------------------------------------------------
Waiver: Small Business
Contributor waives the terms of rule 1 for companies meeting all
the following criteria, counting all subsidiaries and affiliated
entities as one:
@ -69,7 +71,18 @@ entities as one:
2. less than $5 million US dollars in all-time aggregate debt and
equity financing
3. less than 15,000 total pipelines executed using this software
Contributor will not revoke this waiver, but may change terms for
future versions of the software.
-----------------------------------------------------------------
Waiver: Low Volume
Contributor waives the terms of rule 1 for companies meeting all
the following criteria, counting all subsidiaries and affiliated
entities as one:
1. less than 15,000 total pipelines executed using this software
in the immediately preceding, year-long period
Contributor will not revoke this waiver, but may change terms for

View File

@ -16,8 +16,12 @@
package license
// DefaultLicense is an empty license with no restrictions.
var DefaultLicense = &License{Kind: LicenseFoss}
import (
"github.com/drone/drone/core"
)
func Trial(string) *License { return nil }
func Load(string) (*License, error) { return DefaultLicense, nil }
// DefaultLicense is an empty license with no restrictions.
var DefaultLicense = &core.License{Kind: core.LicenseFoss}
func Trial(string) *core.License { return nil }
func Load(string) (*core.License, error) { return DefaultLicense, nil }