Merge pull request #98 from supershabam/master0.11.0

Cut version 0.11.0

2 files changed, 11 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56358d7..dca6fc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
+## 0.11.0 / 2015-07-27
+
+* [FEATURE] Add stats from /proc/net/snmp.
+* [FEATURE] Add support for FreeBSD.
+* [FEATURE] Allow netdev devices to be ignored.
+* [MAINTENANCE] New Dockerfile for unified way to dockerize Prometheus exporters.
+* [FEATURE] Add device,fstype collection to the filesystem exporter.
+* [IMPROVEMENT] Make logging of collector executions less verbose.
+
 ## 0.10.0 / 2015-06-10
+
 * [CHANGE] Change logging output format and flags.
 
 ## 0.9.0 / 2015-05-26
diff --git a/Makefile b/Makefile
index ab6ebd7..14f421a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION  := 0.10.0
+VERSION  := 0.11.0
 TARGET   := node_exporter
 GOFLAGS  := -ldflags "-X main.Version $(VERSION)"