[ARVADOS] updated: 347d974ab2a8e7eecf1f3edc472e03223b0ad1bf

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job                             |   5 +-
 sdk/python/arvados/api.py                          |   6 +-
 sdk/python/arvados/collection.py                   |  42 +++-
 sdk/python/arvados/commands/put.py                 |  17 +-
 sdk/python/arvados/config.py                       |   3 +
 sdk/python/arvados/keep.py                         | 251 +++++++++++++--------
 sdk/python/arvados/stream.py                       |   7 +-
 sdk/python/bin/arv-get                             |   7 +-
 sdk/python/tests/arvados_testutil.py               |  14 --
 sdk/python/tests/run_test_server.py                |  97 ++++++--
 sdk/python/tests/test_arv_put.py                   |  82 +++----
 sdk/python/tests/test_collections.py               |  99 ++++----
 sdk/python/tests/test_keep_client.py               | 221 +++++++-----------
 sdk/python/tests/test_keep_locator.py              |  32 ++-
 sdk/python/tests/test_websockets.py                |   8 +-
 .../api/app/views/admin_notifier/new_user.text.erb |   3 +-
 16 files changed, 495 insertions(+), 399 deletions(-)

       via  347d974ab2a8e7eecf1f3edc472e03223b0ad1bf (commit)
       via  518d15a56c986752b73dab316495e7e3d04739a6 (commit)
       via  8598092dfa7a5036417bba209a494c51812e9374 (commit)
       via  5d8e0b2caf01c6d78f7de20382742b6516697cd9 (commit)
       via  05bea2c50474edeb9d0e3fb8daaf838b58ea9a54 (commit)
       via  40d92dda0dd3e31cbfd5b887ea8465f9940b7540 (commit)
       via  3b9b5c14f6b1cd0cbed75e0d4adf36e10323dbe7 (commit)
       via  da01d7e185a6ce5e96d542c180856ce84e94ed63 (commit)
       via  e17db6aa8bae683f31d06500bbd78b043dce8d9a (commit)
       via  327e1768a130476a411baf4cd4fb602f7a73c5ed (commit)
       via  f05bc0963563ab50341ff042439462b631894de6 (commit)
       via  1afe2c7bbb571004736daf347f5178a27128704c (commit)
       via  f6e6e01802e09e1a108c067519d361caf0fc606f (commit)
      from  a44040a0cb9948b42b72cbd3598e2af86e1864d2 (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 347d974ab2a8e7eecf1f3edc472e03223b0ad1bf
Merge: 518d15a 8598092
Author: radhika <radhika at curoverse.com>
Date:   Wed Aug 20 15:33:18 2014 -0400

    Merge branch 'master' into 3153-auto-setup-user


commit 518d15a56c986752b73dab316495e7e3d04739a6
Author: radhika <radhika at curoverse.com>
Date:   Wed Aug 20 15:29:29 2014 -0400

    3153: update the new user email to include a phrase saying the user is setup when config is on.

diff --git a/services/api/app/views/admin_notifier/new_user.text.erb b/services/api/app/views/admin_notifier/new_user.text.erb
index 374e46e..9fc8f11 100644
--- a/services/api/app/views/admin_notifier/new_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_user.text.erb
@@ -1,5 +1,4 @@
-
-A new user has been created:
+A new user has been created<%=' and setup' if Rails.configuration.auto_setup_new_users %>:
 
   <%= @user.full_name %> <<%= @user.email %>>
 

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


hooks/post-receive
--