[ARVADOS] updated: 9844eb7f071daea026b617ceb2eac79bb595e9e8
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 21 13:32:25 EDT 2015
Summary of changes:
.../views/users/_manage_virtual_machines.html.erb | 9 +-
.../controllers/application_controller_test.rb | 16 +++
.../controllers/collections_controller_test.rb | 53 ++++++++
.../test/controllers/projects_controller_test.rb | 91 +++++++++++++
.../test/controllers/users_controller_test.rb | 45 +++++++
.../test/integration/anonymous_access_test.rb | 10 --
.../test/integration/application_layout_test.rb | 31 +++++
.../test/integration/collection_upload_test.rb | 7 -
.../workbench/test/integration/collections_test.rb | 45 -------
apps/workbench/test/integration/projects_test.rb | 141 ---------------------
apps/workbench/test/integration/users_test.rb | 40 ------
doc/_config.yml | 1 +
doc/_includes/_tutorial_expectations.liquid | 2 +-
doc/images/vm-access-with-webshell.png | Bin 0 -> 61121 bytes
.../install-arv-git-httpd.html.textile.liquid | 24 ++--
.../check-environment.html.textile.liquid | 2 +-
.../ssh-access-unix.html.textile.liquid | 2 +-
.../ssh-access-windows.html.textile.liquid | 2 +-
.../vm-login-with-webshell.html.textile.liquid | 19 +++
doc/user/reference/api-tokens.html.textile.liquid | 2 +-
sdk/python/arvados/commands/ws.py | 6 +-
21 files changed, 279 insertions(+), 269 deletions(-)
create mode 100644 doc/images/vm-access-with-webshell.png
create mode 100644 doc/user/getting_started/vm-login-with-webshell.html.textile.liquid
via 9844eb7f071daea026b617ceb2eac79bb595e9e8 (commit)
via 6995d15780c0e46c02acc23481de7bed906d152f (commit)
via 151064a2cbd152bb81ab1f8fdf102b36bc13ca2a (commit)
via 9b2bf1dddd21c991623e4b2b8b412e1f3fb05d34 (commit)
via 68b018141677e7147fe2b52a88561dc7d57e6d79 (commit)
via 111c659adefb766d3773e48ae839515f8007f67c (commit)
via 6d1fb016135e6126c1d5c17ca02f210ba98dfc13 (commit)
via 106df13f4470b75e6fb4114c94b32b6fc68736f4 (commit)
via 7879727a44d761e633f7282fad6073549495be8a (commit)
via ddb83a220cd6f3b62171c3c374c58e553d82a5d6 (commit)
via c4c8e9b0350aedf985dd99168ce6d3b5afb60acb (commit)
via 6a2f46b152dd122df40012a487b4f4c2f5e37197 (commit)
via cd25f265349e86fab2fbe81959747ce112986806 (commit)
via 2ad8f9ccb5d02e76437e48f2193fbacc4a9ca2ad (commit)
via b08e97355a492d9b4710721b5105e981e49e8238 (commit)
via 61d432f332dd9314f8c4cd57c2393e80e8ecef59 (commit)
via a1ed06fc35101b054efa62a757c92c3c4d14ff06 (commit)
via 7253b0d4cdf9612a4c0de0ca849979cec5e8d382 (commit)
via 4999699d7614f214eb8718b85c5c30e9fb382c23 (commit)
via 85b29e4db84f53e390c7964f43caf91d3a764510 (commit)
via fb9730d1da1eab233e4e7ea01c1015cd70ba6cf7 (commit)
via 1856a3a1e9c95b4db4742ab53f737e91dbf46cff (commit)
via 14dbdda455cb0e49b8848575337c5e7806747ee7 (commit)
via c3a7bb61e982ff5b0747204b79c4ca759c19b537 (commit)
via 2c3c9f64426e825295aeb1f4265d67429ee14cf6 (commit)
via e59b42354a10079ecd579a1dbe53c39a20d05313 (commit)
via 5106490f8cb4d3e6aaa8da2ae46283c1ef64a027 (commit)
via f42c7e3d3344104206ca0b8669e2b07a6b30388e (commit)
via a00eab83a1a2636f5c18be8109f73bf050d1ec88 (commit)
via de98daba898ad2dfa58c9e810d98dadf4d208b95 (commit)
via fc2dc01f5e98b3c1d663e78f882eed20962de9d7 (commit)
via cfcfa1c48d95a07bb961baeef8d7658ddecce41e (commit)
via b67167e763608af2909ce4e4e25c03d0e7db8b84 (commit)
via 6e7c96b2bdf0498028bf6ee3902289e81ec1f2d7 (commit)
from 17e8c59deca04137f66ece7837f96599ff82f4de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 9844eb7f071daea026b617ceb2eac79bb595e9e8
Merge: 6995d15 151064a
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 21 13:32:17 2015 -0400
Merge branch 'master' into 6473-fetch-events-starting-at
commit 6995d15780c0e46c02acc23481de7bed906d152f
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 21 13:31:44 2015 -0400
6473: fix issue with last_log_id argument.
diff --git a/sdk/python/arvados/commands/ws.py b/sdk/python/arvados/commands/ws.py
index be48dc0..9fad8b9 100644
--- a/sdk/python/arvados/commands/ws.py
+++ b/sdk/python/arvados/commands/ws.py
@@ -14,7 +14,7 @@ def main(arguments=None):
parser = argparse.ArgumentParser()
parser.add_argument('-u', '--uuid', type=str, default="", help="Filter events on object_uuid")
parser.add_argument('-f', '--filters', type=str, default="", help="Arvados query filter to apply to log events (JSON encoded)")
- parser.add_argument('-s', '--start_time', type=str, default="", help="Arvados query filter to fetch log events created at or after this time. Allowed format: YYYY-MM-DD or YYYY-MM-DD hh:mm:ss")
+ parser.add_argument('-s', '--start-time', type=str, default="", help="Arvados query filter to fetch log events created at or after this time. Allowed format: YYYY-MM-DD or YYYY-MM-DD hh:mm:ss")
group = parser.add_mutually_exclusive_group()
group.add_argument('--poll-interval', default=15, type=int, help="If websockets is not available, specify the polling interval, default is every 15 seconds")
@@ -62,7 +62,7 @@ def main(arguments=None):
filters += [ ['object_uuid', '=', args.pipeline] ]
if args.start_time:
- args.last_log_id = 1
+ last_log_id = 1
filters += [ ['created_at', '>=', args.start_time] ]
def on_message(ev):
@@ -90,7 +90,7 @@ def main(arguments=None):
print json.dumps(ev)
try:
- ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=args.last_log_id)
+ ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=last_log_id)
if ws:
if args.pipeline:
c = api.pipeline_instances().get(uuid=args.pipeline).execute()
commit 111c659adefb766d3773e48ae839515f8007f67c
Merge: 17e8c59 9b2bf1d
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 21 11:26:50 2015 -0400
Merge branch 'master' into 6473-fetch-events-starting-at
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list