[ARVADOS] updated: 84698df0ff6dcd834c080840f5d7e95a1ce086a9

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/load_config.rb            | 12 +++++++++---
 sdk/python/tests/test_websockets.py             | 11 +++++++----
 services/api/config/initializers/load_config.rb | 12 +++++++++---
 3 files changed, 25 insertions(+), 10 deletions(-)

       via  84698df0ff6dcd834c080840f5d7e95a1ce086a9 (commit)
       via  e621ee479da9664e912a6e74f24342877533872c (commit)
       via  706f34d335cecb9f321dda8abaf8718fa951e908 (commit)
       via  9ac57b0bc6cb5d90da57c943df489401c63b7a7f (commit)
       via  c790738ae71771a5574b166b3e93a1bca9b89bf6 (commit)
       via  ed8897b942f147afccf8eeac1025861ffe2f1690 (commit)
       via  318e3d183c3800863731a20a10f1b8bf9cc82280 (commit)
      from  1c6515a4445e9fd79961c9c8caf21528f16d9399 (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 84698df0ff6dcd834c080840f5d7e95a1ce086a9
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 20 09:19:27 2015 -0400

    6473: create ancestor object before subscribe

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index c62397f..b0367be 100644
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -22,14 +22,17 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
     def _test_subscribe(self, poll_fallback, expect_type, last_log_id=None, additional_filters=None, expected=1):
         run_test_server.authorize_with('active')
         events = Queue.Queue(100)
+
+        # Create ancestor before subscribing.
+        # When listening with start_time in the past, this should also be retrieved.
+        # However, when start_time is omitted in subscribe, this should not be fetched.
+        ancestor = arvados.api('v1').humans().create(body={}).execute()
+        time.sleep(5)
+
         filters = [['object_uuid', 'is_a', 'arvados#human']]
         if additional_filters:
             filters = filters + additional_filters
 
-            # Create an extra object before subscribing and verify that as well
-            ancestor = arvados.api('v1').humans().create(body={}).execute()
-            time.sleep(5)
-
         self.ws = arvados.events.subscribe(
             arvados.api('v1'), filters,
             events.put, poll_fallback=poll_fallback, last_log_id=last_log_id)

commit e621ee479da9664e912a6e74f24342877533872c
Merge: 1c6515a 706f34d
Author: radhika <radhika at curoverse.com>
Date:   Sat Jul 18 13:37:20 2015 -0400

    Merge branch 'master' of git.curoverse.com:arvados into 6473-fetch-events-starting-at


-----------------------------------------------------------------------


hooks/post-receive
--