Skip to content

Commit 316b327

Browse files
committed
Merge pull request #50 from prometheus/beorn7/license-cleanup
License cleanup
2 parents 3713bd7 + 3706852 commit 316b327

File tree

5 files changed

+56
-2
lines changed

5 files changed

+56
-2
lines changed

AUTHORS.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
The Prometheus project was started by Matt T. Proud (emeritus) and
2+
Julius Volz in 2012.
3+
4+
Maintainers of this repository:
5+
6+
* Björn Rabenstein <[email protected]>
7+
8+
The following individuals have contributed code to this repository
9+
(listed in alphabetical order):
10+
11+
* Bernerd Schaefer <[email protected]>
12+
* Björn Rabenstein <[email protected]>
13+
* Daniel Bornkessel <[email protected]>
14+
* Jeff Younker <[email protected]>
15+
* Julius Volz <[email protected]>
16+
* Matt T. Proud <[email protected]>
17+
* Tobias Schmidt <[email protected]>
18+

CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Contributing
2+
3+
Prometheus uses GitHub to manage reviews of pull requests.
4+
5+
* If you have a trivial fix or improvement, go ahead and create a pull
6+
request, addressing (with `@...`) one or more of the maintainers
7+
(see [AUTHORS.md](AUTHORS.md)) in the description of the pull request.
8+
9+
* If you plan to do something more involved, first discuss your ideas
10+
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
11+
This will avoid unnecessary work and surely give you and us a good deal
12+
of inspiration.
13+
14+
* Relevant coding style guidelines are the [Go Code Review
15+
Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments)
16+
and the _Formatting and style_ section of Peter Bourgon's [Go: Best
17+
Practices for Production
18+
Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style).

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2013 Prometheus Team
189+
Copyright [yyyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

NOTICE

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Prometheus instrumentation library for Go applications
2+
Copyright 2012-2015 The Prometheus Authors
3+
4+
This product includes software developed at
5+
SoundCloud Ltd. (http://soundcloud.com/).
6+
7+
8+
The following components are included in this product:
9+
10+
goautoneg
11+
http://bitbucket.org/ww/goautoneg
12+
Copyright 2011, Open Knowledge Foundation Ltd.
13+
See README.txt for license details.
14+
15+
perks - a fork of https://github.com/bmizerany/perks
16+
https://github.com/beorn7/perks
17+
Copyright 2013-2015 Blake Mizerany, Björn Rabenstein
18+
See https://github.com/beorn7/perks/blob/master/README.md for license details.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ continue your journey:
2727

2828
## Contributing
2929

30-
See the contributing guidelines for the [Prometheus server](https://github.com/prometheus/prometheus/blob/master/CONTRIBUTING.md).
30+
See the [contributing guidelines](CONTRIBUTING.md).

0 commit comments

Comments
 (0)