From: Tim Pierce <twp@curoverse.com>
Date: Thu, 3 Apr 2014 19:51:48 +0000 (-0400)
Subject: Merge branch '2221-complete-docker' (closes #2325, closes #2221)
X-Git-Tag: 1.1.0~2690^2~64
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6d73acc845a2dd7413fdde0742473d83bf3d0719

Merge branch '2221-complete-docker' (closes #2325, closes #2221)

Conflicts:
	.gitignore
---

6d73acc845a2dd7413fdde0742473d83bf3d0719
diff --cc .gitignore
index 4fe6ac8b19,f27930edc8..8cf65b56b8
--- a/.gitignore
+++ b/.gitignore
@@@ -2,5 -2,10 +2,9 @@@
  *.pyc
  docker/*/generated/*
  docker/config.yml
 -doc/_site/*
  doc/.site/*
  doc/sdk/python/arvados
+ sdk/perl/MYMETA.*
+ sdk/perl/Makefile
+ sdk/perl/blib/*
+ sdk/perl/pm_to_blib