aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Volz <julius@soundcloud.com>2015-06-10 17:56:11 +0200
committerJulius Volz <julius@soundcloud.com>2015-06-10 17:56:11 +0200
commit484eedbf015f1848e9a5412c55a3c4bdfdf8a685 (patch)
tree53f43931b084835480005f96a3b65e97092b9555
parent94d225919bd147651c0fcb08d6a878575f8ffdec (diff)
parent8b3cf08b032fd18a16bc1ad7ec676ab40997f17a (diff)
downloadprometheus_node_collector-0.10.0.tar.bz2
prometheus_node_collector-0.10.0.tar.xz
prometheus_node_collector-0.10.0.zip
Merge pull request #83 from prometheus/v0.100.10.0
Cut version 0.10.0.
-rw-r--r--CHANGELOG.md3
-rw-r--r--Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cebab6f..56358d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
1## 0.10.0 / 2015-06-10
2* [CHANGE] Change logging output format and flags.
3
1## 0.9.0 / 2015-05-26 4## 0.9.0 / 2015-05-26
2 5
3* [BUGFIX] Fix `/proc/net/dev` parsing. 6* [BUGFIX] Fix `/proc/net/dev` parsing.
diff --git a/Makefile b/Makefile
index 96e257b..ab6ebd7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
11# See the License for the specific language governing permissions and 11# See the License for the specific language governing permissions and
12# limitations under the License. 12# limitations under the License.
13 13
14VERSION := 0.9.0 14VERSION := 0.10.0
15TARGET := node_exporter 15TARGET := node_exporter
16GOFLAGS := -ldflags "-X main.Version $(VERSION)" 16GOFLAGS := -ldflags "-X main.Version $(VERSION)"
17 17