[ARVADOS] updated: 735d5487e328eb51bbaaca0475e4facf6af84567

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml |  4 ++++
 apps/workbench/config/diagnostics.yml         | 14 --------------
 apps/workbench/config/diagnostics.yml.example | 14 --------------
 apps/workbench/config/load_config.rb          |  2 +-
 sdk/cli/bin/crunch-job                        | 22 +++++++++++-----------
 5 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 apps/workbench/config/diagnostics.yml
 delete mode 100644 apps/workbench/config/diagnostics.yml.example

       via  735d5487e328eb51bbaaca0475e4facf6af84567 (commit)
       via  9a57602cd575021709b94ea2fe80c414d482211c (commit)
       via  b0440160e64caecbff160a26f62301dd15d84c7f (commit)
      from  37cd41354dd5acccd2c0405fbe0c4a8d29a79670 (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 735d5487e328eb51bbaaca0475e4facf6af84567
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 9 15:35:58 2014 -0400

    2761: use application.yml to configure diagnostics testing

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 1be5454..7c68648 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -95,6 +95,10 @@ common:
   default_openid_prefix: https://www.google.com/accounts/o8/id
   send_user_setup_notification_email: true
 
+  # Configuration for diagnostics testing. Use this to enable diagnostics testing for an env.
+  diagnostics_testing_active_user_token: false
+  # End configuration for diagnostics testing
+
   # Set user_profile_form_fields to enable and configure the user profile page.
   # Default is set to false. A commented setting with full description is provided below.
   user_profile_form_fields: false
diff --git a/apps/workbench/config/diagnostics.yml b/apps/workbench/config/diagnostics.yml
deleted file mode 100644
index b3f9b48..0000000
--- a/apps/workbench/config/diagnostics.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not use this file for diagnostics testing configuration.
-# Instead, create diagnostics.yml by making a copy
-
-development:
-  diagnostics_testing_active_user_token: "eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r"
-  diagnostics_testing_admin_user_token: false
-
-production:
-  diagnostics_testing_active_user_token: false
-  diagnostics_testing_admin_user_token: false
-
-common:
-  diagnostics_testing_active_user_token: false
-  diagnostics_testing_admin_user_token: false
diff --git a/apps/workbench/config/diagnostics.yml.example b/apps/workbench/config/diagnostics.yml.example
deleted file mode 100644
index 4093e42..0000000
--- a/apps/workbench/config/diagnostics.yml.example
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not use this file for diagnostics testing configuration.
-# Instead, create diagnostics.yml by making a copy
-
-development:
-  diagnostics_testing_active_user_token: false
-  diagnostics_testing_admin_user_token: false
-
-production:
-  diagnostics_testing_active_user_token: false
-  diagnostics_testing_admin_user_token: false
-
-common:
-  diagnostics_testing_active_user_token: false
-  diagnostics_testing_admin_user_token: false
diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index f47c8a8..51fc81a 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -3,7 +3,7 @@
 
 $application_config = {}
 
-%w(application.default application diagnostics).each do |cfgfile|
+%w(application.default application).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)

commit 9a57602cd575021709b94ea2fe80c414d482211c
Merge: 37cd413 b044016
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 9 15:19:21 2014 -0400

    Merge branch 'master' into 2761-diagnostic-suite


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


hooks/post-receive
--