[mb-commits] branch, beta, updated. Merge remote-tracking branch 'metabrainz/new-amazon-ids' into beta Added new ...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=163e6f519bb16d0625ace1f996bb9b11f84fe12b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f90c2e553edc074ac42091eb25135725420937f3 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=26a26fa67d0be89648f8aa92b01b01002f0be5b1 (commit)

Summary of changes:
 lib/DBDefs/Default.pm |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

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.

- Log -----------------------------------------------------------------
commit 163e6f519bb16d0625ace1f996bb9b11f84fe12b
Merge: 26a26fa f90c2e5
Author: Ian McEwen <[email protected]>
Date:   Wed Dec 12 17:26:19 2012 -0700

    Merge remote-tracking branch 'metabrainz/new-amazon-ids' into beta
    
    * metabrainz/new-amazon-ids:
      Added new amazon store ids


commit f90c2e553edc074ac42091eb25135725420937f3
Author: Robert Kaye <[email protected]>
Date:   Wed Dec 12 16:20:34 2012 -0800

    Added new amazon store ids

diff --git a/lib/DBDefs.pm.default b/lib/DBDefs.pm.default
index 94b6264..a1464db 100644
--- a/lib/DBDefs.pm.default
+++ b/lib/DBDefs.pm.default
@@ -309,13 +309,14 @@ sub ANNOTATION_LOCK_TIME { 60*15 }
 
 # Amazon associate and developer ids
 my %amazon_store_associate_ids = (
-    'amazon.ca'         => 'musicbrainz01-20',
-    'amazon.co.jp'    => 'musicbrainz-22',
-    'amazon.co.uk'    => 'musicbrainz0c-21',
+    'amazon.ca'         => 'music0b72-20',
+    'amazon.co.jp'    => 'musicbrainzjp-22',
+    'amazon.co.uk'    => 'music080d-21',
     'amazon.com'    => 'musicbrainz0d-20',
-    'amazon.de'         => 'musicbrainz00-21',
-    'amazon.fr'         => 'musicbrainz0e-21',
-    'amazon.it'         => '', #TODO: Someone should probably sign up for an associate ID.
+    'amazon.de'         => 'music059-21',
+    'amazon.fr'         => 'music083d-21',
+    'amazon.it'         => 'music084d-21',
+    'amazon.es'         => 'music02e-21',
 );
 
 sub AWS_ASSOCIATE_ID

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


hooks/post-receive
-- 
mb_server