mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 14:47:19 -04:00
Merge branch 'master' into experimental/petef-jruby
This commit is contained in:
commit
4d395c8674
2 changed files with 2 additions and 2 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
|||
.*.swp
|
||||
*.gem
|
||||
local
|
||||
|
||||
test/setup
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
|||
Copyright 2009-2010 Jordan Sissel, Pete Fritchman, and contributors.
|
||||
Copyright 2009-2011 Jordan Sissel, Pete Fritchman, and contributors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue