Resolve merge conflict
[arvados.git] / lib / google / api_client / auth / storages /
2014-12-17 Steven BazylResolve merge conflict
2014-12-15 Steven BazylResolve merge conflict, update rspec syntax and docs
2014-12-15 Steven BazylMerge branch 'p7s1digital-master'
2014-12-15 Steven BazylResolve merge conflict, update rspec syntax
2014-01-10 Michael C. Beckmoved default key into constant
2014-01-10 Michael C. Beckadded optional redis credential key to be set
2013-12-03 Volker Zöpfeladds specs for file_store
2013-11-28 Volker Zöpfelload_credentials just returns nil on errors
2013-11-14 Volker Zöpfelsplit storages in own adapter classes, added redis...