github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into experimental/petef-jruby

Browse source
This commit is contained in:
Pete Fritchman 2011-02-19 11:47:02 -08:00
commit 4d395c8674
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
.*.swp .*.swp
*.gem *.gem
local local
test/setup

2
LICENSE
View file

@ -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"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.