[ARVADOS] updated: 75df7deca434d9b3b161dc2d7d13ae21b1fe4b08

git at public.curoverse.com git at public.curoverse.com
Fri Apr 11 16:13:39 EDT 2014


Summary of changes:
 sdk/cli/bin/crunch-job                             |   49 +++--
 .../api/app/models/api_client_authorization.rb     |   12 +
 services/api/app/models/arvados_model.rb           |   40 ++++
 services/api/app/models/log.rb                     |   43 ++++-
 ...20140407184311_rename_log_info_to_properties.rb |    5 +
 services/api/db/schema.rb                          |   34 ++--
 .../functional/arvados/v1/logs_controller_test.rb  |   11 +
 .../api/test/integration/collections_api_test.rb   |   18 ++-
 services/api/test/integration/permissions_test.rb  |    4 -
 services/api/test/test_helper.rb                   |    3 +
 services/api/test/unit/log_test.rb                 |  227 +++++++++++++++++++-
 services/keep/keep.go                              |   44 ++++-
 12 files changed, 430 insertions(+), 60 deletions(-)
 create mode 100644 services/api/db/migrate/20140407184311_rename_log_info_to_properties.rb

       via  75df7deca434d9b3b161dc2d7d13ae21b1fe4b08 (commit)
       via  18afe83690fd311ff7019abdad7b63a02574d9a8 (commit)
       via  ab32ff89cfdca64de9765e85fbc15d621e847f88 (commit)
       via  9fd58497a867ae3846a5c4761eb724d1d1b91fc7 (commit)
       via  e3c48fef662408636cb49fe1bb0a3c1040269e7c (commit)
       via  94c762ed797f2567c1dcc70d12582c7d640da7bb (commit)
       via  45ff1f04cf0a562b870e18ca13b02d914db6bcb3 (commit)
       via  ad6e6f2457f354b666cdc322915d591743a4cd2f (commit)
       via  aa75c6199c209d9967e3eff976039494f58ff6bc (commit)
       via  966ab8387e2762d1720e6104a5f5f6d1e0cc52fe (commit)
       via  a2ebfeadbbdba03dc6e4a02cb5d4e6b85fa747f3 (commit)
       via  3420c2d2c55eb9466b04bc3c4ca3073caf66aba0 (commit)
       via  88e682e6fc472fcc4fd2d9a0ab39ee6ba6252de0 (commit)
       via  442e5c6553061ef1bbb8d9194bb5b8d9cdb68545 (commit)
       via  2386475f3bf86824e320ad121838955278ed3083 (commit)
       via  44df50add91dc3117291e3a6a908fa442b883106 (commit)
       via  bb3b70b2435a0886b4a2ace9070e24903b04c8a9 (commit)
       via  91f2216807f5b7fb521d61f1a110484a6e5aa2e7 (commit)
       via  e37caee5e3cfc165c6505ea5f3b55a4b8b07fe5e (commit)
       via  635a2b59e4a9a3ec147b7064a932e4db17bc3955 (commit)
       via  e93b022d02fa68cc3cf34afb8d5448cf984789ac (commit)
       via  54978ac2108a5b1913f641d480143356659a413a (commit)
       via  19f8cc45bfbe938c0988a719a146a577c2ca7ca5 (commit)
       via  7ca1198b2e64cdd823f424c1bd009f364abfe2d0 (commit)
       via  c4a50125bec07063e91be6ca7c7ce209d5840642 (commit)
      from  17c335f710c5f855f61c13fe69594d7ec439b007 (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 75df7deca434d9b3b161dc2d7d13ae21b1fe4b08
Merge: 17c335f 18afe83
Author: Tim Pierce <twp at curoverse.com>
Date:   Fri Apr 11 16:15:36 2014 -0400

    Merge branch 'master' into 2449-keep-index-status-handlers

diff --cc services/keep/keep.go
index 71c2a8b,3adffcf..8683abf
--- a/services/keep/keep.go
+++ b/services/keep/keep.go
@@@ -4,8 -4,8 +4,9 @@@ import 
  	"bufio"
  	"bytes"
  	"crypto/md5"
 +	"encoding/json"
  	"errors"
+ 	"flag"
  	"fmt"
  	"github.com/gorilla/mux"
  	"io/ioutil"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list