Resolve merge conflict, update rspec syntax and docs
[arvados.git] / script /
drwxr-xr-x   ..
-rwxr-xr-x 153 package
-rwxr-xr-x 339 release