diff options
| author | Luc Donnet | 2015-01-30 15:06:29 +0100 |
|---|---|---|
| committer | Luc Donnet | 2015-01-30 15:06:29 +0100 |
| commit | a75950b06ee61bf7e159debb973768f0b18bdd95 (patch) | |
| tree | abbb8865f0a237fec901b64ef20b4e41254bb005 /config/database.yml.ccontrol | |
| parent | b9147ae5a58c1395493e04f289b98722f10c7622 (diff) | |
| download | chouette-core-a75950b06ee61bf7e159debb973768f0b18bdd95.tar.bz2 | |
Fix and update travis config
Diffstat (limited to 'config/database.yml.ccontrol')
| -rw-r--r-- | config/database.yml.ccontrol | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol deleted file mode 100644 index 1936af0e1..000000000 --- a/config/database.yml.ccontrol +++ /dev/null @@ -1,22 +0,0 @@ -development: - adapter: jdbcpostgresql - database: chouette2_dev - encoding: utf8 - username: chouette - password: chouette - -test: - adapter: jdbcpostgresql - database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> - encoding: utf8 - username: chouette - password: chouette - -# When war is created by jenkins -production: - adapter: jdbcpostgresql - database: chouette2 - encoding: utf8 - host: localhost - username: chouette - password: chouette |