diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-06-24 23:57:47 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-06-24 23:57:47 -0700 |
| commit | c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6 (patch) | |
| tree | 01f9f42f30a4aa2f73cb200c89a71254bf74d80e /.gitignore | |
| parent | 48c7e373c62b2e8cf48157ceb0d92c38c3a40652 (diff) | |
| parent | 78ffe164b33c6b11a2e511442605acd2f795a1b5 (diff) | |
| download | spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.tar.gz spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.tar.bz2 spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.zip | |
Merge branch 'master' into streaming
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6c9ffa5426..ae39c52b11 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ dependency-reduced-pom.xml .ensime .ensime_lucene checkpoint +derby.log |