[mb-commits] branch, beta, updated. Merge branch 'mbs-209' into beta Merge branch 'master' into mbs-209 MBS-209 , ...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0015f8107b3589a131d1521217200244f5f77c08 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fc5b7dc74c035dfd9b7d58d45f7545aed01973f7 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3f953266db5e830d6b4db3990dddaf62c0f9e971 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3889deff7921d49b7a22da2809c83f591a48db31 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ba70789ff25d5289697fbb7df8eb1d244be476fe (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2d59e0677de28befc162df20a78df30ec88a6f06 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller/WS/2/Artist.pm   |    7 +++-
 lib/MusicBrainz/Server/Controller/WS/2/Label.pm    |    7 +++-
 .../Server/Controller/WS/2/Recording.pm            |    7 +++-
 lib/MusicBrainz/Server/Controller/WS/2/Release.pm  |    7 +++-
 .../Server/Controller/WS/2/ReleaseGroup.pm         |    7 +++-
 lib/MusicBrainz/Server/Controller/WS/2/Work.pm     |    9 +++++-
 .../Server/WebService/Serializer/JSON/2/Artist.pm  |    1 +
 .../Server/WebService/Serializer/JSON/2/Label.pm   |    1 +
 .../WebService/Serializer/JSON/2/Recording.pm      |    1 +
 .../Server/WebService/Serializer/JSON/2/Release.pm |    1 +
 .../WebService/Serializer/JSON/2/ReleaseGroup.pm   |    1 +
 .../JSON/2/Role/{Rating.pm => Annotation.pm}       |   18 ++++---------
 .../Server/WebService/Serializer/JSON/2/Work.pm    |    1 +
 lib/MusicBrainz/Server/WebService/WebServiceInc.pm |    2 +-
 lib/MusicBrainz/Server/WebService/XMLSerializer.pm |   21 ++++++++++++++-
 .../Server/Controller/WS/2/JSON/LookupArtist.pm    |   19 ++++++++++++++
 .../Server/Controller/WS/2/JSON/LookupLabel.pm     |   25 ++++++++++++++++++
 .../Server/Controller/WS/2/JSON/LookupRecording.pm |   18 +++++++++++++
 .../Server/Controller/WS/2/JSON/LookupRelease.pm   |   27 ++++++++++++++++++++
 .../Controller/WS/2/JSON/LookupReleaseGroup.pm     |   19 ++++++++++++++
 .../Server/Controller/WS/2/JSON/LookupWork.pm      |   18 ++++++++++++-
 .../Server/Controller/WS/2/LookupArtist.pm         |   12 +++++++++
 .../Server/Controller/WS/2/LookupLabel.pm          |   14 ++++++++++
 .../Server/Controller/WS/2/LookupRecording.pm      |   12 +++++++++
 .../Server/Controller/WS/2/LookupRelease.pm        |   19 ++++++++++++++
 .../Server/Controller/WS/2/LookupReleaseGroup.pm   |   13 +++++++++
 .../Server/Controller/WS/2/LookupWork.pm           |   11 ++++++++
 t/sql/webservice_annotation.sql                    |   21 +++++++++++++++
 28 files changed, 292 insertions(+), 27 deletions(-)
 copy lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/{Rating.pm => Annotation.pm} (71%)
 create mode 100644 t/sql/webservice_annotation.sql

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 0015f8107b3589a131d1521217200244f5f77c08
Merge: 2d59e06 fc5b7dc
Author: warp <[email protected]>
Date:   Wed Oct 31 11:13:56 2012 +0100

    Merge branch 'mbs-209' into beta
    
    * mbs-209:
      MBS-209, render annotation according to current xml schema and add annotations to json.
      Revert "Revert "Merge branch 'mbs-209' into beta""


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


hooks/post-receive
-- 
mb_server