Merge branch '1.0.0'

elastic · Nov 23, 2015 · a34dd80 · a34dd80
2 parents 626f478 + 6557682
commit a34dd80
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,17 @@
 All notable changes to this project will be documented in this file based on the
 [Keep a Changelog](http://keepachangelog.com/) Standard.
 
-## [Unreleased](https://github.com/elastic/libbeat/compare/1.0.0-rc2...HEAD)
+## [Unreleased](https://github.com/elastic/filebeat/compare/1.0.0...HEAD)
+
+### Backward Compatibility Breaks
+
+### Bugfixes
+
+### Added
+
+### Deprecated
+
+## [1.0.0](https://github.com/elastic/filebeat/compare/1.0.0-rc2...1.0.0) - 2015-11-24
 
 ### Backward Compatibility Breaks
 
@@ -14,7 +24,7 @@ All notable changes to this project will be documented in this file based on the
 
 ### Deprecated
 
-## [1.0.0-rc2](https://github.com/elastic/libbeat/compare/1.0.0-rc1...1.0.0-rc2) - 2015-11-17
+## [1.0.0-rc2](https://github.com/elastic/filebeat/compare/1.0.0-rc1...1.0.0-rc2) - 2015-11-17
 
 ### Backward Compatibility Breaks
 - Removed utf-16be-bom encoding support. Support will be added with fix for #205
@@ -32,7 +42,7 @@ All notable changes to this project will be documented in this file based on the
 
 ### Deprecated
 
-## [1.0.0-rc1](https://github.com/elastic/libbeat/compare/1.0.0-beta4...1.0.0-rc1)
+## [1.0.0-rc1](https://github.com/elastic/filebeat/compare/1.0.0-beta4...1.0.0-rc1)
 
 ### Backward Compatibility Breaks
 - Rename the timestamp field with @timestamp #168

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/service/service.go b/Godeps/_workspace/src/github.com/elastic/libbeat/service/service.go
diff --git a/main.go b/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/elastic/libbeat/logp"
 )
 
-var Version = "1.0.0-rc2"
+var Version = "1.0.0"
 var Name = "filebeat"
 
 var GlobalBeat *beat.Beat