Skip to content

Commit

Permalink
Merge pull request elastic#393 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 6c548c6 + e32748b commit 5fdc255
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
18 changes: 14 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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/packetbeat/compare/1.0.0...HEAD)

### Backward Compatibility Breaks

Expand All @@ -12,7 +12,17 @@ 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](https://github.com/elastic/packetbeat/compare/1.0.0-rc2...1.0.0) 2015-11-24

### Backward Compatibility Breaks

### Bugfixes

### Added

### Deprecated

## [1.0.0-rc2](https://github.com/elastic/packetbeat/compare/1.0.0-rc1...1.0.0-rc2) 2015-11-17

### Backward Compatibility Breaks

Expand All @@ -24,7 +34,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) 2015-11-04
## [1.0.0-rc1](https://github.com/elastic/packetbeat/compare/1.0.0-beta4...1.0.0-rc1) 2015-11-04

### Backward Compatibility Breaks
- Rename timestamp field with @timestamp. #343
Expand All @@ -37,7 +47,7 @@ All notable changes to this project will be documented in this file based on the

### Deprecated

## [1.0.0-beta4](https://github.com/elastic/libbeat/compare/1.0.0-beta3...1.0.0-beta4) 2015-10-21
## [1.0.0-beta4](https://github.com/elastic/packetbeat/compare/1.0.0-beta3...1.0.0-beta4) 2015-10-21

### Backward Compatibility Breaks
- Renamed http module config file option 'strip_authorization' to 'redact_authorization'
Expand Down
4 changes: 2 additions & 2 deletions deploytools/saltstack/packetbeat/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ packetbeat:
- installed
- sources:
{% if grains['os_family'] == 'RedHat' %}
- packetbeat: https://download.elastic.co/beats/packetbeat/packetbeat-1.0.0-rc2-x86_64.rpm
- packetbeat: https://download.elastic.co/beats/packetbeat/packetbeat-1.0.0-x86_64.rpm
{% elif grains['os_family'] == 'Debian' %}
- packetbeat: https://download.elastic.co/beats/packetbeat/packetbeat_1.0.0-rc2_amd64.deb
- packetbeat: https://download.elastic.co/beats/packetbeat/packetbeat_1.0.0_amd64.deb
{% endif %}
service:
- running
Expand Down
2 changes: 1 addition & 1 deletion packetbeat.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

// You can overwrite these, e.g.: go build -ldflags "-X main.Version 1.0.0-beta3"
var Version = "1.0.0-rc2"
var Version = "1.0.0"
var Name = "packetbeat"

var EnabledProtocolPlugins map[protos.Protocol]protos.ProtocolPlugin = map[protos.Protocol]protos.ProtocolPlugin{
Expand Down

0 comments on commit 5fdc255

Please sign in to comment.