[mb-commits] branch, beta, updated. Merge branch 'pino-beta' into beta MBH-298, move $lb_scheme stuff up in the c...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1300f0c144a48105c2016253d209da5cfd7e2408 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a659084ce180810f81478540184fc2d769313a15 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b62fc51c65c6e8ce127ebd6caa4dcb86f5eb5d7f (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c8b8ceafca36c285d975e8054c20c87efcbd09f7 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=952d18aa001ea794a25d4e509c74230178ac3282 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=35e29edff13694bfb45b2a0169bc0d3ba74a87fb (commit)

Summary of changes:
 admin/nginx/002-beta               |    2 +-
 admin/nginx/mbserver-rewrites.conf |  309 +++++++++++++++++++-----------------
 admin/socket-deploy.sh             |    3 +
 3 files changed, 166 insertions(+), 148 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 1300f0c144a48105c2016253d209da5cfd7e2408
Merge: 35e29ed a659084
Author: warp <[email protected]>
Date:   Fri Jan 18 11:55:22 2013 +0100

    Merge branch 'pino-beta' into beta
    
    * pino-beta:
      MBH-298, move $lb_scheme stuff up in the configuration so that it's used by the www.musicbrainz.org redirect as well.
      MBH-298, when rewriting urls, use the scheme sent by the load balancer instead of our local scheme.
      MBH-298, Force correct server hostname/port on rewrites.
      Listen on port 81, enable proxy in socket-deploy.


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


hooks/post-receive
-- 
mb_server