merge upstream

elastic · Sep 18, 2015 · 9b38dc3 · 9b38dc3
2 parents 1108710 + d76c9c2
commit 9b38dc3
Show file tree

Hide file tree

Showing 148 changed files with 12,650 additions and 1,409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,11 @@
 *.swo
 *.swn
 packetbeat.test
-/profile.cov
-/cover/coverage.html
+*.dev.yml
+
+/coverage/
 /docs/html_docs
+/build/
 
 # Folders
 _obj
@@ -33,3 +35,10 @@ _testmain.go
 
 # IDE files / folders
 .idea
+
+last_run
+
+*.test
+.DS_Store
+
+env
diff --git a/.travis.yml b/.travis.yml
@@ -23,14 +23,12 @@ install:
   - make
 
 script:
-  - make testlong
+  - make full-coverage
 
 notifications:
     email:
         - [email protected]
         - [email protected]
 
 after_success:
-  # Copy profile.cov to coverage.txt because codecov.io requires this file
-  - cp profile.cov coverage.txt
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash) -f coverage/full.cov
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/beat/beat.go b/Godeps/_workspace/src/github.com/elastic/libbeat/beat/beat.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/beat/beat_test.go b/Godeps/_workspace/src/github.com/elastic/libbeat/beat/beat_test.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/cfgfile/cfgfile.go b/Godeps/_workspace/src/github.com/elastic/libbeat/cfgfile/cfgfile.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/cfgfile/cfgfile_test.go b/Godeps/_workspace/src/github.com/elastic/libbeat/cfgfile/cfgfile_test.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/common/mapstr.go b/Godeps/_workspace/src/github.com/elastic/libbeat/common/mapstr.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/common/net_test.go b/Godeps/_workspace/src/github.com/elastic/libbeat/common/net_test.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/common/statuses.go b/Godeps/_workspace/src/github.com/elastic/libbeat/common/statuses.go