projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cbc35c 22db593)
Merge branch 'master' into 2505-update-docs
authorTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:31:14 +0000 (17:31 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:31:14 +0000 (17:31 -0400)
Conflicts:
.gitignore

1  2 
.gitignore patch | diff1 | diff2 | blob | history
services/api/app/models/job.rb patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index 83eb73cbe775e2d769fd66254ec13cbab0552e58,5a92ffea6ac86524bf2b93a532b0aa0ea7c2f99f..2156fdf7e7404d77dcd0f853428596304aa9398f
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -8,6 -6,8 +8,9 @@@ doc/.sit
  doc/sdk/python/arvados
  sdk/perl/MYMETA.*
  sdk/perl/Makefile
 -sdk/perl/blib/*
 +sdk/perl/blib
  sdk/perl/pm_to_blib
 +*/vendor/bundle
+ services/keep/bin
+ services/keep/pkg
+ services/keep/src/github.com
diff --cc services/api/app/models/job.rb
Simple merge