Skip to content

Commit

Permalink
Merge pull request #274 from tsg/close_changelog
Browse files Browse the repository at this point in the history
Closed changelog and set version
  • Loading branch information
andrewkroh committed Nov 20, 2015
2 parents 93e3fc1 + 76f91e4 commit 064d7eb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
16 changes: 13 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 064d7eb

Please sign in to comment.