projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2871-preload-objects
[arvados.git]
/
services
/
api
/
config
/
database.yml.sample
diff --git
a/services/api/config/database.yml.sample
b/services/api/config/database.yml.sample
index 51f1028072430e32c7eb522b35716a969695b6e6..6a2701622b0d3e1649ffe6c74a45ed36ce6b0a6e 100644
(file)
--- a/
services/api/config/database.yml.sample
+++ b/
services/api/config/database.yml.sample
@@
-1,24
+1,24
@@
development:
development:
- adapter:
my
sql
+ adapter:
postgre
sql
encoding: utf8
encoding: utf8
- database:
orv
os_development
- username:
orv
os
- password:
********
+ database:
arvad
os_development
+ username:
arvad
os
+ password:
xxxxxxxx
host: localhost
test:
host: localhost
test:
- adapter:
my
sql
+ adapter:
postgre
sql
encoding: utf8
encoding: utf8
- database:
orv
os_test
- username:
orv
os
- password:
********
+ database:
arvad
os_test
+ username:
arvad
os
+ password:
xxxxxxxx
host: localhost
production:
host: localhost
production:
- adapter:
my
sql
+ adapter:
postgre
sql
encoding: utf8
encoding: utf8
- database:
orv
os_production
- username:
orv
os
- password:
********
+ database:
arvad
os_production
+ username:
arvad
os
+ password:
xxxxxxxx
host: localhost
host: localhost