[ARVADOS] updated: d2519d3624786ada30885dc8666236f1872b7652

[git at public.curoverse.com]

Summary of changes:
 doc/install/install-api-server.html.textile.liquid |  2 +-
 .../test/fixtures/api_client_authorizations.yml    |  6 ++
 services/api/test/fixtures/collections.yml         | 36 +++++++++++
 services/api/test/fixtures/groups.yml              | 12 ++++
 services/api/test/fixtures/links.yml               | 15 +++++
 services/api/test/fixtures/pipeline_instances.yml  | 35 +++++++++++
 services/api/test/fixtures/pipeline_templates.yml  | 21 +++++++
 services/api/test/fixtures/users.yml               |  8 +++
 services/fuse/tests/test_mount.py                  | 69 +++++++++++-----------
 9 files changed, 169 insertions(+), 35 deletions(-)

       via  d2519d3624786ada30885dc8666236f1872b7652 (commit)
       via  c57a72b32577f0732d174f8497470972a3f77773 (commit)
       via  313f5fedd4214d077e2b5c7c26bab4df3895c44a (commit)
       via  f39bdf87343e1e8a2c5c81221d262422c2651de2 (commit)
       via  102582e4b0c70349fc6b9077fd7618782a1a49bd (commit)
       via  52141835e85e4014a691e036f89bcd71a98bd6b2 (commit)
       via  ddc1f6b0c54b72df395cfef26e0dc4eb8f65463d (commit)
      from  78343b453361dfc02c489d3711a72a58f38f2b93 (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 d2519d3624786ada30885dc8666236f1872b7652
Merge: c57a72b 313f5fe
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 31 16:58:39 2014 -0400

    Merge branch 'master' into 4024-scroll-dashboard-recent-pipelines
    
    Conflicts:
    	services/api/test/fixtures/api_client_authorizations.yml
    	services/api/test/fixtures/users.yml

diff --cc services/api/test/fixtures/api_client_authorizations.yml
index 068cc99,54329b0..1eb397f
--- a/services/api/test/fixtures/api_client_authorizations.yml
+++ b/services/api/test/fixtures/api_client_authorizations.yml
@@@ -193,20 -193,9 +193,26 @@@ user1_with_load
    api_token: 1234k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi
    expires_at: 2038-01-01 00:00:00
  
 +user_with_no_objs:
 +  api_client: untrusted
 +  user: user_with_no_objs
 +  api_token: 1234k6lzmp9kj5cpkcoxie963cmvjahbt0123456u30k1jqdmi
 +  expires_at: 2038-01-01 00:00:00
 +
 +user_with_5_finished_pipelines:
 +  api_client: untrusted
 +  user: user_with_5_finished_pipelines
 +  api_token: 1234k6lzmp9kj5abcdefgh963cmvjahbt0123456u30k1jqdmi
 +  expires_at: 2038-01-01 00:00:00
 +
 +user_with_1_running_25_finished_pipelines:
 +  api_client: untrusted
 +  user: user_with_1_running_25_finished_pipelines
 +  api_token: 1234k6lzmp9kj5abcdefgh12345678hbt0123456u30k1jqdmi
 +  expires_at: 2038-01-01 00:00:00
++
+ fuse:
+   api_client: untrusted
+   user: fuse
+   api_token: 4nagbkv8eap0uok7pxm72nossq5asihls3yn5p4xmvqx5t5e7p
+   expires_at: 2038-01-01 00:00:00
 -
diff --cc services/api/test/fixtures/users.yml
index b0b4b95,ebf455a..5ee4745
--- a/services/api/test/fixtures/users.yml
+++ b/services/api/test/fixtures/users.yml
@@@ -256,17 -242,3 +256,25 @@@ user_with_5_finished_pipelines
      profile:
        organization: example.com
        role: IT
 +
 +user_with_1_running_25_finished_pipelines:
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  uuid: zzzzz-tpzed-user025finished
 +  email: user_with_25_finished at arvados.local
 +  first_name: user_with_1_finished
 +  last_name: User
 +  identity_url: https://user_with_25_finished.openid.local
 +  is_active: true
 +  is_admin: false
 +  prefs:
 +    profile:
 +      organization: example.com
 +      role: IT
++
++fuse:
++  owner_uuid: zzzzz-tpzed-000000000000000
++  uuid: zzzzz-tpzed-0fusedrivertest
++  email: fuse at arvados.local
++  first_name: FUSE
++  last_name: User
++  identity_url: https://fuse.openid.local

commit c57a72b32577f0732d174f8497470972a3f77773
Merge: 78343b4 102582e
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 31 16:46:03 2014 -0400

    Merge branch 'master' into 4024-scroll-dashboard-recent-pipelines


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


hooks/post-receive
--