radhika [Thu, 16 Jul 2015 03:28:06 +0000 (23:28 -0400)]
Merge branch 'master' into 6473-fetch-events-starting-at
radhika [Thu, 16 Jul 2015 03:23:47 +0000 (23:23 -0400)]
6473: add start_time additional argument to arv-ws
Ward Vandewege [Thu, 16 Jul 2015 01:33:01 +0000 (21:33 -0400)]
arvdock realclean/deepclean should not delete images tagged as arvados/build.
No issue #
Tom Clegg [Wed, 15 Jul 2015 21:29:16 +0000 (17:29 -0400)]
Merge branch '5898-listen-race' closes #5898
Tom Clegg [Wed, 15 Jul 2015 21:28:54 +0000 (17:28 -0400)]
5898: Wait for servers to start *listening* before running integration tests against them.
Tom Clegg [Wed, 15 Jul 2015 20:24:47 +0000 (16:24 -0400)]
6362: Allow config/application.yml to override environments/*.rb in apiserver, too.
Tom Clegg [Tue, 14 Jul 2015 17:49:51 +0000 (13:49 -0400)]
6362: Update bootstrap gem.
See https://github.com/twbs/bootstrap-sass/issues/653
Tom Clegg [Wed, 15 Jul 2015 19:47:11 +0000 (15:47 -0400)]
Merge branch '6610-login-without-ssh-key' closes #6610
Tom Clegg [Tue, 14 Jul 2015 17:49:15 +0000 (13:49 -0400)]
6362: Change config precedence order.
Before: environments/*.rb, Rails defaults, application.yml,
application.default.yml.
After: application.yml, application.default.yml, environments/*.rb,
Rails defaults.
This makes it possible to use application*.yml to control configs that
have Rails defaults. (application.default.yml file has had such
configs for ages, like assets.digest, but they have never been
effective.)
Manoj [Wed, 15 Jul 2015 19:37:42 +0000 (15:37 -0400)]
Merge branch 'master' of git.curoverse.com:arvados into 6465-optimize-workbench-integration-tests
Manoj [Wed, 15 Jul 2015 19:28:31 +0000 (15:28 -0400)]
6465-Added tests to collections_controller_test, removed 4 tests
from collections_test and one test from collections_upload_test.
Tom Clegg [Wed, 15 Jul 2015 16:31:55 +0000 (12:31 -0400)]
6610: Include all user->VM login permission, even for users without SSH keys.
Peter Amstutz [Wed, 15 Jul 2015 15:02:36 +0000 (11:02 -0400)]
Merge branch '6221-datamanager-delete' refs #6221
bryan [Wed, 15 Jul 2015 14:33:11 +0000 (10:33 -0400)]
Merge branch '5288-arv-copy-documentation' refs #5288
bryan [Wed, 15 Jul 2015 14:21:05 +0000 (10:21 -0400)]
Note #16
Manoj [Wed, 15 Jul 2015 12:43:27 +0000 (08:43 -0400)]
Merge branch 'master' into 6465-optimize-workbench-integration-tests
Manoj [Wed, 15 Jul 2015 12:22:16 +0000 (08:22 -0400)]
6465-Added tests to project_controllers_test and users_controller
test and removed tests from users_test.
bryan [Tue, 14 Jul 2015 20:48:06 +0000 (16:48 -0400)]
Note #15
bryan [Tue, 14 Jul 2015 20:35:58 +0000 (16:35 -0400)]
added note #13
Peter Amstutz [Tue, 14 Jul 2015 20:34:54 +0000 (16:34 -0400)]
6221: Check never_delete must be true.
radhika [Tue, 14 Jul 2015 20:13:47 +0000 (16:13 -0400)]
closes #6219
Merge branch '6219-fuse-performance-testing'
radhika [Tue, 14 Jul 2015 20:13:05 +0000 (16:13 -0400)]
Merge branch 'master' into 6219-fuse-performance-testing
bryan [Tue, 14 Jul 2015 19:07:31 +0000 (15:07 -0400)]
Fixed more syntax errors
bryan [Tue, 14 Jul 2015 19:00:54 +0000 (15:00 -0400)]
Fixed syntax
bryan [Tue, 14 Jul 2015 18:19:32 +0000 (14:19 -0400)]
Fixed more comments
Peter Amstutz [Tue, 14 Jul 2015 18:02:18 +0000 (14:02 -0400)]
6221: Make never_delete true by default, make trash_worker respect never_delete, add
test.
bryan [Tue, 14 Jul 2015 18:01:19 +0000 (14:01 -0400)]
Fixed some changes but need to add copy git repos
bryan [Tue, 14 Jul 2015 17:53:49 +0000 (13:53 -0400)]
added png and need to switch to 6014 to grab the url
Peter Amstutz [Tue, 14 Jul 2015 17:40:24 +0000 (13:40 -0400)]
Merge branch '6484-fuse-fsync-erofs' closes #6484
Peter Amstutz [Tue, 14 Jul 2015 17:40:07 +0000 (13:40 -0400)]
Merge branch 'github-3408-production-datamanager' refs #3408
Peter Amstutz [Tue, 14 Jul 2015 17:39:36 +0000 (13:39 -0400)]
Merge branch 'master' into github-3408-production-datamanager
Conflicts:
services/datamanager/keep/keep.go
radhika [Tue, 14 Jul 2015 17:22:11 +0000 (13:22 -0400)]
Merge branch 'master' into 6219-fuse-performance-testing
radhika [Tue, 14 Jul 2015 15:10:18 +0000 (11:10 -0400)]
closes #6014
Merge branch '6014-repo-creation-doc'
radhika [Tue, 14 Jul 2015 15:10:00 +0000 (11:10 -0400)]
Merge branch 'master' into 6014-repo-creation-doc
bryan [Tue, 14 Jul 2015 14:31:10 +0000 (10:31 -0400)]
added _arv_copy_expectations
Brett Smith [Tue, 14 Jul 2015 09:31:34 +0000 (05:31 -0400)]
API server installation doc clones arvados over the network.
Now that we've moved away from a source-based install, there isn't
necessarily a checkout anywhere on the host. This is most likely to
work. No issue #.
Peter Amstutz [Mon, 13 Jul 2015 21:43:57 +0000 (17:43 -0400)]
6484: Ignore filehandle flush if object is not writable.
radhika [Mon, 13 Jul 2015 21:16:06 +0000 (17:16 -0400)]
closes #6445
Merge branch '6445-incorrect-task-runtime-calc'
radhika [Mon, 13 Jul 2015 21:11:35 +0000 (17:11 -0400)]
6014: minor updates
radhika [Mon, 13 Jul 2015 20:28:48 +0000 (16:28 -0400)]
6445: update the job status line also to use the job's finished_at time when task has none.
radhika [Mon, 13 Jul 2015 20:26:08 +0000 (16:26 -0400)]
Merge branch 'master' into 6445-incorrect-task-runtime-calc
Manoj [Mon, 13 Jul 2015 19:14:46 +0000 (15:14 -0400)]
6465- Removed test "edit name and verify that a duplicate is not
created" from projects integration test to application controller
test.
radhika [Mon, 13 Jul 2015 19:10:37 +0000 (15:10 -0400)]
6014: Add "add new repository" page to create a tutorial repository, and update the tutorial-submit-job page to use the tutorial repository.
bryan [Mon, 13 Jul 2015 17:02:58 +0000 (13:02 -0400)]
Ready for review
bryan [Mon, 13 Jul 2015 17:00:10 +0000 (13:00 -0400)]
changed formatting of cluster1 and cluster2
bryan [Mon, 13 Jul 2015 16:56:40 +0000 (12:56 -0400)]
changed arv-copy expectations and moved around words in the html file
bryan [Mon, 13 Jul 2015 16:47:12 +0000 (12:47 -0400)]
changed formatting and added words
bryan [Mon, 13 Jul 2015 15:41:12 +0000 (11:41 -0400)]
Added documentation for copying collections and pipeline templates and instances
Manoj [Mon, 13 Jul 2015 15:36:26 +0000 (11:36 -0400)]
Merge branch 'master' into 6465-optimize-workbench-integration-tests
Manoj [Mon, 13 Jul 2015 15:18:23 +0000 (11:18 -0400)]
6465-Moved test "project viewer can't see project sharing tab" from
projects integration test to projects controller test.
radhika [Fri, 10 Jul 2015 22:46:59 +0000 (18:46 -0400)]
refs #6279
Merge branch '6279-web-shell-client'
radhika [Fri, 10 Jul 2015 22:44:59 +0000 (18:44 -0400)]
6279: open the webshell client in a blank window.
Ward Vandewege [Fri, 10 Jul 2015 20:18:59 +0000 (16:18 -0400)]
Merge branch '6569-smarter-jobs-image'
closes #6569
Ward Vandewege [Fri, 10 Jul 2015 20:18:44 +0000 (16:18 -0400)]
Merge branch 'master' into 6569-smarter-jobs-image
bryan [Fri, 10 Jul 2015 19:43:48 +0000 (15:43 -0400)]
Change _config.yaml to point to arv-copy.html.textile.liquid
Tom Clegg [Fri, 10 Jul 2015 18:39:22 +0000 (14:39 -0400)]
Merge branch '6279-web-shell-client' closes #6279
Tom Clegg [Fri, 10 Jul 2015 17:35:10 +0000 (13:35 -0400)]
6279: Hide "reconnect" button because it doesn't auto-login.
Tom Clegg [Fri, 10 Jul 2015 16:55:44 +0000 (12:55 -0400)]
6279: Provide feedback that authentication token has been sent.
Tom Clegg [Fri, 10 Jul 2015 16:45:54 +0000 (12:45 -0400)]
6279: Do not retry a request that "timed out" in less than 2 seconds.
In this case it's probably not a timeout -- more likely a CORS problem
that the browser is not allowed to report to the Javascript program.
In such cases, retrying ad infinitum will not help.
Tom Clegg [Fri, 10 Jul 2015 15:18:46 +0000 (11:18 -0400)]
6279: Do not set content-length headers in XHR.
According to error messages in Chrome console:
Refused to set unsafe header "Content-Length"
ShellInABox.sendRequest @ shell_in_a_box.js:178
ShellInABox.onReadyStateChange @ shell_in_a_box.js:206
(anonymous function) @ shell_in_a_box.js:183
Tom Clegg [Fri, 10 Jul 2015 15:16:43 +0000 (11:16 -0400)]
6279: Move keyboard assets to /public/webshell/
Ward Vandewege [Fri, 10 Jul 2015 14:58:43 +0000 (10:58 -0400)]
Make sure to add python-virtualenv to the Docker arvados/jobs image.
refs #6569
radhika [Fri, 10 Jul 2015 14:44:10 +0000 (10:44 -0400)]
6445: when a task does not have finished_at time, use the finished_at time from it's job - if one is available.
Tom Clegg [Fri, 10 Jul 2015 13:32:16 +0000 (09:32 -0400)]
Merge branch '6222-memory-status' refs #6222
Ward Vandewege [Fri, 10 Jul 2015 03:19:04 +0000 (23:19 -0400)]
Merge branch 'master' into 6569-smarter-jobs-image
Tom Clegg [Fri, 10 Jul 2015 03:02:59 +0000 (23:02 -0400)]
Merge branch '6218-python-sdk-perf' closes #6218
Tom Clegg [Tue, 7 Jul 2015 15:28:05 +0000 (11:28 -0400)]
6218: Generate profiling data for a few arvados.collection.Collection scenarios.
Ward Vandewege [Fri, 10 Jul 2015 03:00:20 +0000 (23:00 -0400)]
Make sure that mkimage-debootstrap.sh uses -f when tagging docker
images.
refs #6528
Ward Vandewege [Fri, 10 Jul 2015 02:20:44 +0000 (22:20 -0400)]
Make sure that mkimage-debootstrap.sh does not try to do an interactive
docker run when there's no tty.
refs #6528
Ward Vandewege [Fri, 10 Jul 2015 02:09:18 +0000 (22:09 -0400)]
Make the arvados/jobs image leaner.
refs #6569
Tom Clegg [Thu, 9 Jul 2015 20:38:16 +0000 (16:38 -0400)]
6279: Move webshell action into VirtualMachinesController, tweak formatting & config.
* Document config var
* Accept formatting references like %{hostname} and %{uuid} in config
var instead of always appending "/#{hostname}"
* Fix favicon, js, and stylesheet paths (use asset_path helper); move
js and css into public/webshell/
* Use j() quoting helper in js.erb
radhika [Thu, 9 Jul 2015 14:14:45 +0000 (10:14 -0400)]
6279: added shell_in_a_box url as comment
radhika [Thu, 9 Jul 2015 13:43:43 +0000 (09:43 -0400)]
6279: Noticed that enabled.gif is also needed. I see this one when I use the right mouse click in shell_in_a_box terminal,
and use the reset option. Added this gif.
radhika [Thu, 9 Jul 2015 01:37:11 +0000 (21:37 -0400)]
6279: add some comments
radhika [Thu, 9 Jul 2015 01:07:22 +0000 (21:07 -0400)]
i6279: The '-' and '_' are not working in Firefox. Upon googling, found this URL that suggested a workaround:
https://code.google.com/p/shellinabox/issues/detail?id=202
radhika [Thu, 9 Jul 2015 00:26:23 +0000 (20:26 -0400)]
Merge branch 'master' into 6279-web-shell-client
radhika [Thu, 9 Jul 2015 00:25:51 +0000 (20:25 -0400)]
6279: if hostname ends with .shell, strip it.
Brett Smith [Wed, 8 Jul 2015 21:19:53 +0000 (17:19 -0400)]
6358: Declare FUSE driver's dependency on llfuse >= 0.40.
The workaround added in
08284382 requires this version. Below that,
llfuse's Queue at least lives in a different place. We may be able to
support older versions with more nuance, but for now, just codify the
current reality.
Closes #6358. Refs #3198.
Nico Cesar [Wed, 8 Jul 2015 20:44:18 +0000 (16:44 -0400)]
qiuck fix to arvados-pam vulnerability
no issue #
Tom Clegg [Wed, 8 Jul 2015 18:56:30 +0000 (14:56 -0400)]
Merge branch '6377-dev-startup' refs #6377
radhika [Wed, 8 Jul 2015 18:46:22 +0000 (14:46 -0400)]
Merge branch 'master' into 6279-web-shell-client
Nico Cesar [Wed, 8 Jul 2015 18:09:07 +0000 (14:09 -0400)]
Merge branch '6384-libpam-arvados'
closes #6384
Ward Vandewege [Wed, 8 Jul 2015 17:58:41 +0000 (13:58 -0400)]
Whitespace fixes
refs #6384
Ward Vandewege [Wed, 8 Jul 2015 17:57:17 +0000 (13:57 -0400)]
Merge branch 'master' into 6384-libpam-arvados
Nico Cesar [Wed, 8 Jul 2015 17:53:31 +0000 (13:53 -0400)]
6384: reverting names
Ward Vandewege [Wed, 8 Jul 2015 16:47:07 +0000 (12:47 -0400)]
Rename file
refs #2256
Ward Vandewege [Wed, 8 Jul 2015 16:19:18 +0000 (12:19 -0400)]
Fix path for arvados_pam.py
refs #2256
Ward Vandewege [Wed, 8 Jul 2015 16:09:17 +0000 (12:09 -0400)]
Fix typo.
refs #2256
Manoj [Wed, 8 Jul 2015 15:40:16 +0000 (11:40 -0400)]
Merge branch 'master' into 6465-optimize-workbench-integration-tests
Manoj [Wed, 8 Jul 2015 15:34:13 +0000 (11:34 -0400)]
6465-Removed two description based tests in projects integration test and added four tests in projects controller test.
Kept one description test in projects integration test to check if the edit description button works.
Nico Cesar [Wed, 8 Jul 2015 15:30:49 +0000 (11:30 -0400)]
added /etc/default/arvados_pam as a parameter
refs #6512
Tom Clegg [Wed, 8 Jul 2015 14:13:04 +0000 (10:13 -0400)]
Fix typo. No issue #
Tom Clegg [Wed, 8 Jul 2015 05:56:21 +0000 (01:56 -0400)]
6377: Update docs to use application.yml instead of omniauth.rb for SSO config.
Tom Clegg [Wed, 8 Jul 2015 05:12:58 +0000 (01:12 -0400)]
6377: Fix crash if no asset pipeline.
Tom Clegg [Tue, 7 Jul 2015 20:45:16 +0000 (16:45 -0400)]
6377: Update ruby to 2.1.6. Remove bundler version pin (not needed since
ca1d997).
Tom Clegg [Wed, 1 Jul 2015 02:47:50 +0000 (22:47 -0400)]
6377: Avoid "incompatible encoding" errors by using blank template0 instead of site-specific template1.
Tom Clegg [Tue, 30 Jun 2015 15:20:38 +0000 (11:20 -0400)]
6377: Fix reversed condition in "site application.yml is optional" fix.
Tom Clegg [Tue, 30 Jun 2015 15:19:04 +0000 (11:19 -0400)]
6377: Use fork of themes_for_rails with fixed gemspec.
Allows installing with current bundler versions, which treat the invalid
gemspec as an error.
Tom Clegg [Tue, 30 Jun 2015 15:07:24 +0000 (11:07 -0400)]
6377: Support loading omniauth config from application.yml.
radhika [Wed, 8 Jul 2015 02:30:25 +0000 (22:30 -0400)]
Merge branch 'master' into 6279-web-shell-client