You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2017/02/14 21:41:55 UTC
[1/2] incubator-toree git commit: Update .gitignore configuration file
Repository: incubator-toree
Updated Branches:
refs/heads/master 80882ad06 -> d629761d8
Update .gitignore configuration file
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/3a67d93a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/3a67d93a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/3a67d93a
Branch: refs/heads/master
Commit: 3a67d93a37a2fd43e483e59d63de883f80c79422
Parents: 16a27b0
Author: Luciano Resende <lr...@apache.org>
Authored: Sat Jan 7 18:09:50 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Wed Feb 1 09:32:27 2017 -0800
----------------------------------------------------------------------
.gitignore | 43 ++++++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/3a67d93a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f692b1a..7ff7af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,30 +15,43 @@
# limitations under the License.
#
-build/
-**/derby.log
-**/metastore_db
-**/*__pycache__
-**.swp
-target/
+# Mac
+.DS_Store
+
+# Intellij
.idea/
.idea_modules/
-.DS_Store
-.vagrant
*.iml
+*.iws
+*.class
+*.log
+
+# Jekyll
+.jekyll-metadata
+
+# Python
+**/*__pycache__
+
+# Notebooks
+!etc/**/*.ipynb
*.ipynb
.ipynb_checkpoints/
-apache-rat-*.jar
-!etc/**/*.ipynb
-scratch/
-**/*ivy.xml
+Untitled*.ipynb
+
+# Other build related artifacts
+target/
+build/
test-output/
out/
dist/
-
+scratch/
+apache-rat-*.jar
+**/derby.log
+**/metastore_db
+**.swp
+**/*ivy.xml
+.vagrant
.example-image
.ensime
.ensime_cache/
-
-Untitled*.ipynb
.system-test-image
[2/2] incubator-toree git commit: Merging pr #91
Posted by ma...@apache.org.
Merging pr #91
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/d629761d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/d629761d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/d629761d
Branch: refs/heads/master
Commit: d629761d8a90673ea51353db9987ca06cceb48d1
Parents: 80882ad 3a67d93
Author: mariusvniekerk <ma...@gmail.com>
Authored: Tue Feb 14 16:41:53 2017 -0500
Committer: mariusvniekerk <ma...@gmail.com>
Committed: Tue Feb 14 16:41:53 2017 -0500
----------------------------------------------------------------------
.gitignore | 43 ++++++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------