Merge pull request #40 from containerops/develop

Release 0.4.0
Huawei · Aug 17, 2015 · ea1558d · ea1558d
2 parents 5dbd324 + 37d72b4
commit ea1558d
Show file tree

Hide file tree

Showing 332 changed files with 37,933 additions and 10,793 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ _testmain.go
 dockyard
 conf/runtime.conf
 log/*
+data/*
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ _testmain.go @@
     dockyard
     conf/runtime.conf
     log/*
+    data/*