Tom Clegg [Sun, 30 Nov 2014 02:27:08 +0000 (21:27 -0500)]
4446: Merge branch 'master' into 4446-nodes-index
Conflicts:
apps/workbench/app/assets/javascripts/application.js
Tom Clegg [Sun, 30 Nov 2014 02:23:44 +0000 (21:23 -0500)]
4446: Ember first draft.
Phil Hodgson [Fri, 28 Nov 2014 11:58:45 +0000 (12:58 +0100)]
Merge branch '4233-graph-job-stats' closes #4233
Phil Hodgson [Fri, 28 Nov 2014 11:13:09 +0000 (12:13 +0100)]
4233: websocket test of log charting should look at the right datapoint
Phil Hodgson [Wed, 26 Nov 2014 19:04:07 +0000 (20:04 +0100)]
4233: adjustment to previous commit, round numbers before comparing - stay loose
Phil Hodgson [Wed, 26 Nov 2014 18:40:00 +0000 (19:40 +0100)]
4233: only divide CPU usage by number of CPUs when total CPU usage is less than the measured interval time
Phil Hodgson [Wed, 26 Nov 2014 17:32:08 +0000 (18:32 +0100)]
4233: split up received log entries by newline characters too
Tom Clegg [Wed, 26 Nov 2014 07:25:22 +0000 (02:25 -0500)]
3781: Fix OPTIONS routing.
Tom Clegg [Wed, 26 Nov 2014 05:56:27 +0000 (00:56 -0500)]
3781: Merge branch 'master' into 3781-browser-friendly-servers
Tom Clegg [Mon, 24 Nov 2014 04:28:34 +0000 (23:28 -0500)]
3781: Fix error propagation.
Tom Clegg [Sun, 23 Nov 2014 07:09:11 +0000 (02:09 -0500)]
3781: Add allowed headers. Respond to OPTIONS at any path.
Tom Clegg [Sat, 22 Nov 2014 20:45:14 +0000 (15:45 -0500)]
3781: Add POST method for writing without knowing MD5.
Tom Clegg [Sat, 22 Nov 2014 10:01:13 +0000 (05:01 -0500)]
3781: Set CORS headers in keepproxy responses.
Tom Clegg [Wed, 26 Nov 2014 05:40:49 +0000 (00:40 -0500)]
3781: Add tests for CORS headers. Turn off CORS headers at OPTIONS /login etc.
Tom Clegg [Sat, 22 Nov 2014 09:49:53 +0000 (04:49 -0500)]
3781: Set CORS headers in API responses.
Ward Vandewege [Tue, 25 Nov 2014 20:53:59 +0000 (15:53 -0500)]
Document arv keep ls in the cli sdk reference.
No issue #
Phil Hodgson [Tue, 25 Nov 2014 09:36:07 +0000 (10:36 +0100)]
4233: prepend historical log entries
Phil Hodgson [Tue, 25 Nov 2014 09:00:51 +0000 (10:00 +0100)]
4233: use "success" JS function after AJAX call to get logs rather than a JS view to "push" logs to the log chart
Phil Hodgson [Tue, 25 Nov 2014 07:41:37 +0000 (08:41 +0100)]
4233: convert accidental tabs to spaces
Phil Hodgson [Tue, 25 Nov 2014 07:30:20 +0000 (08:30 +0100)]
Merge branch 'master' into 4233-graph-job-stats
Tom Clegg [Tue, 25 Nov 2014 00:35:35 +0000 (19:35 -0500)]
Update arvados-cli Gemfile.lock. No issue #
Tom Clegg [Tue, 25 Nov 2014 00:30:43 +0000 (19:30 -0500)]
Merge branch '4651-boolean-params' closes #4651
Tom Clegg [Mon, 24 Nov 2014 19:07:26 +0000 (14:07 -0500)]
4651: Fix exceptions. Accept 0 for false, 1 for true.
Tom Clegg [Mon, 24 Nov 2014 17:18:54 +0000 (12:18 -0500)]
4651: ensure_unique_name param is not required.
Tom Clegg [Mon, 24 Nov 2014 15:51:01 +0000 (10:51 -0500)]
4651: Merge branch 'master' into 4651-boolean-params
Tom Clegg [Mon, 24 Nov 2014 15:44:53 +0000 (10:44 -0500)]
4651: Update NodesController _ping_requires_parameters format.
Tom Clegg [Mon, 24 Nov 2014 15:23:31 +0000 (10:23 -0500)]
4651: Fix KeepDisksController test failures.
Ward Vandewege [Mon, 24 Nov 2014 01:47:33 +0000 (20:47 -0500)]
Merge branch '4186-install-doc-improvements'
refs #4186
Ward Vandewege [Mon, 24 Nov 2014 01:46:49 +0000 (20:46 -0500)]
Improve the installation instructions for keepproxy and keepstore - take sudo into account.
refs #4186
Ward Vandewege [Sat, 22 Nov 2014 22:06:44 +0000 (17:06 -0500)]
Merge branch '4336-improve-upload-data-to-keep-doc'
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:04:27 +0000 (17:04 -0500)]
Refactor the 'Uploading data' page.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:03:57 +0000 (17:03 -0500)]
Add basic documentation for arv keep put and arv keep get.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:03:08 +0000 (17:03 -0500)]
Link directly to the CLI SDK install instructions.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 21:57:43 +0000 (16:57 -0500)]
Make the 'check-environment' blurb stand out more from the regular text.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:17:57 +0000 (15:17 -0500)]
Wording improvements on the sdk cli installation page.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:12:43 +0000 (15:12 -0500)]
Fix typo.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:08:22 +0000 (15:08 -0500)]
Add third installation option for the python SDK: our debian/ubuntu packages.
refs #4336
Phil Hodgson [Sat, 22 Nov 2014 12:37:36 +0000 (13:37 +0100)]
4233: select from Logs table only columns we will need
Phil Hodgson [Sat, 22 Nov 2014 12:27:40 +0000 (13:27 +0100)]
4233: consistent use of ISO time-zone in timestamps corrects differences between Firefox and Chrome's charting results
Phil Hodgson [Sat, 22 Nov 2014 11:52:16 +0000 (12:52 +0100)]
4233: ignore negative deltas when charting log stats
Phil Hodgson [Sat, 22 Nov 2014 11:30:10 +0000 (12:30 +0100)]
4233: refactor to only query the log lines once and use the JS triggers to create both the text log div and the stat chart at the same time
Phil Hodgson [Sat, 22 Nov 2014 10:50:22 +0000 (11:50 +0100)]
4233: do not show "raw" data for datapoint if not defined
Phil Hodgson [Sat, 22 Nov 2014 09:43:58 +0000 (10:43 +0100)]
4233: tab character corrected
Tom Clegg [Sat, 22 Nov 2014 00:09:43 +0000 (19:09 -0500)]
4651: Accept "false" as false for a boolean param. Reject bogus strings.
Also, advertise find_or_create param from the controller, not just the
discovery document generator.
radhika [Fri, 21 Nov 2014 21:57:51 +0000 (16:57 -0500)]
closes #4339
Merge branch '4339-test-error-while-loading-tab'
radhika [Fri, 21 Nov 2014 21:42:05 +0000 (16:42 -0500)]
4339: config will be reset after each test, so no need to reset it explicitly. also, use assert_selector instead of assert has_link?
radhika [Fri, 21 Nov 2014 21:06:44 +0000 (16:06 -0500)]
4339: add test for "error while loading tab"
radhika [Fri, 21 Nov 2014 20:03:05 +0000 (15:03 -0500)]
refs #4156
Merge branch '4156-cli-tests'
radhika [Fri, 21 Nov 2014 19:50:58 +0000 (14:50 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Fri, 21 Nov 2014 19:50:25 +0000 (14:50 -0500)]
4156: uncomment one of the asserts
radhika [Fri, 21 Nov 2014 19:21:14 +0000 (14:21 -0500)]
closes #4641
Merge branch '4641-make-jenkins-tests-pass'
radhika [Fri, 21 Nov 2014 18:20:33 +0000 (13:20 -0500)]
4641: click on confirm dialog OK button in sharing test on Revoke action.
radhika [Fri, 21 Nov 2014 16:32:55 +0000 (11:32 -0500)]
4641: use selenium driver and bigger page width.
radhika [Fri, 21 Nov 2014 13:52:15 +0000 (08:52 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Fri, 21 Nov 2014 13:51:37 +0000 (08:51 -0500)]
4156: 3 more tests needed to be skipped.
Tom Clegg [Thu, 20 Nov 2014 21:56:05 +0000 (16:56 -0500)]
Merge branch '4400-python-install-herring' refs #4400
Tim Pierce [Thu, 20 Nov 2014 21:39:33 +0000 (16:39 -0500)]
Merge branch '4595-document-arv-filters'
Refs #4595.
Ward Vandewege [Thu, 20 Nov 2014 21:35:04 +0000 (16:35 -0500)]
Reorganize the arv documentation a bit more, putting it all in one place.
refs #4595
Tom Clegg [Thu, 20 Nov 2014 21:33:49 +0000 (16:33 -0500)]
4400: Fix whitespace. Fix tagging in nodemanager, too.
Ward Vandewege [Thu, 20 Nov 2014 20:47:45 +0000 (15:47 -0500)]
Remove spurious empty line
refs #4595
Tim Pierce [Thu, 20 Nov 2014 20:38:14 +0000 (15:38 -0500)]
4595: add documentation for list --filters
radhika [Thu, 20 Nov 2014 19:08:56 +0000 (14:08 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Thu, 20 Nov 2014 18:57:58 +0000 (13:57 -0500)]
closes #4592
Merge branch '4592-input-selection'
radhika [Thu, 20 Nov 2014 18:48:44 +0000 (13:48 -0500)]
4592: update fixture checksum
radhika [Thu, 20 Nov 2014 18:27:55 +0000 (13:27 -0500)]
4156: skip all the tests that require api server until #4534 is completed.
radhika [Thu, 20 Nov 2014 17:36:07 +0000 (12:36 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Thu, 20 Nov 2014 17:29:54 +0000 (12:29 -0500)]
4592: add fixture to be used by the api server test "search collections with 'any' operator".
Phil Hodgson [Thu, 20 Nov 2014 17:19:39 +0000 (18:19 +0100)]
4233: make the log replay helper deal with the old date format
Phil Hodgson [Thu, 20 Nov 2014 17:17:53 +0000 (18:17 +0100)]
4233: in hover popup only show datapoints that are defined
Phil Hodgson [Thu, 20 Nov 2014 17:17:24 +0000 (18:17 +0100)]
4233: bug fix: match log line regex from beginning of line
Tom Clegg [Thu, 20 Nov 2014 17:04:48 +0000 (12:04 -0500)]
Fix wrong variable assigned. refs #3824
Tom Clegg [Thu, 20 Nov 2014 17:02:57 +0000 (12:02 -0500)]
Fix syntax error in whitespace. refs #3824
radhika [Thu, 20 Nov 2014 16:59:29 +0000 (11:59 -0500)]
Merge branch 'master' into 4592-input-selection
radhika [Thu, 20 Nov 2014 16:46:41 +0000 (11:46 -0500)]
Merge branch 'master' into 4592-input-selection
Brett Smith [Thu, 20 Nov 2014 16:25:21 +0000 (11:25 -0500)]
Merge branch '4027-api-sdk-requires-docker-wip'
Refs #4027. Closes #4626, #4629.
Brett Smith [Thu, 20 Nov 2014 14:52:53 +0000 (09:52 -0500)]
4027: API Jobs that specify SDK version must also use Docker.
Because compute nodes will be upgraded regularly, we don't want to
guarantee that we'll have the necessary tools to run older SDK
versions. The primary motivation for this feature is to install SDKs
into Docker images, so we require that to be specified.
This commit removes a few `job.valid?` assertions from the job unit
tests. These are redundant when they come after `Job.create!` because
that will raise an exception if the job isn't valid.
radhika [Thu, 20 Nov 2014 16:23:09 +0000 (11:23 -0500)]
Merge branch 'master' into 4592-input-selection
radhika [Thu, 20 Nov 2014 16:20:50 +0000 (11:20 -0500)]
Merge branch 'master' into 4156-cli-tests
Phil Hodgson [Thu, 20 Nov 2014 16:07:32 +0000 (17:07 +0100)]
4233: bug fixes for previous refactor and also now display series for rss and swap mem stats
Tom Clegg [Thu, 20 Nov 2014 15:59:47 +0000 (10:59 -0500)]
4400: Do not add ".commitdate.hash" tag if a build tag is already set.
Tom Clegg [Thu, 20 Nov 2014 15:41:00 +0000 (10:41 -0500)]
Merge branch '3824-docker-fixes' refs #3824 refs #4186
Tom Clegg [Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)]
3824: Merge branch 'master' into 3824-docker-fixes
Ward Vandewege [Thu, 20 Nov 2014 15:32:24 +0000 (10:32 -0500)]
A few wording tweaks.
refs #3824
Phil Hodgson [Thu, 20 Nov 2014 14:55:35 +0000 (15:55 +0100)]
4233: remove "delete log entries" option
- this did not work as usefully as anticipated: one actually also wants the graph to be cleared, which has to be done manually anyway. The way to do this then would be to also invent a signal to be sent to the browser by the simulator, telling it to clear the graph stuff
Phil Hodgson [Thu, 20 Nov 2014 14:50:48 +0000 (15:50 +0100)]
4233: missing include from last commit
Phil Hodgson [Thu, 20 Nov 2014 14:49:03 +0000 (15:49 +0100)]
4233: refactor to separate addDatum function
- this anticipates being able to add multiple datapoints from one log line, as for memory log lines
Phil Hodgson [Thu, 20 Nov 2014 13:21:08 +0000 (14:21 +0100)]
4233: try to match older log date format
Phil Hodgson [Thu, 20 Nov 2014 13:18:07 +0000 (14:18 +0100)]
4233: better hover presentation (left aligned, clearer task numbers)
Phil Hodgson [Thu, 20 Nov 2014 12:39:11 +0000 (13:39 +0100)]
4233: initial chart points added via AJAX
Phil Hodgson [Thu, 20 Nov 2014 12:19:03 +0000 (13:19 +0100)]
Merge branch 'master' into 4233-graph-job-stats
radhika [Thu, 20 Nov 2014 05:20:49 +0000 (00:20 -0500)]
4592: add test where a collection with no name is selected as input to a pipeline instance.
radhika [Thu, 20 Nov 2014 02:05:16 +0000 (21:05 -0500)]
4592: Fix the nil error when a collection without a name is selected as input.
Also refactor the pipeline instances integration test to break re-run instance test into its own test.
radhika [Wed, 19 Nov 2014 19:24:53 +0000 (14:24 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Wed, 19 Nov 2014 19:23:11 +0000 (14:23 -0500)]
4156: skip arv-tag tests while arv-tag is being worked on.
Phil Hodgson [Wed, 19 Nov 2014 19:15:34 +0000 (20:15 +0100)]
Merge branch '3382-always-show-inputs' (closes #3382)
Phil Hodgson [Wed, 19 Nov 2014 18:50:19 +0000 (19:50 +0100)]
Merge branch 'master' into 3382-always-show-inputs
radhika [Wed, 19 Nov 2014 16:25:04 +0000 (11:25 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Wed, 19 Nov 2014 16:19:27 +0000 (11:19 -0500)]
closes #4250
Merge branch '4250-doc-updates'
radhika [Wed, 19 Nov 2014 14:00:05 +0000 (09:00 -0500)]
4250: keep doc update
Phil Hodgson [Wed, 19 Nov 2014 13:26:25 +0000 (14:26 +0100)]
4233: sort hover display by task then stat name
projects / arvados.git / log