[mb-commits] branch, beta, updated. Merge remote-tracking branch 'freso/MBS-5766' into beta MBS-5766: Re-add / url...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=18dd3347a9e1a5dade7d6fab82cae2ef31b30ab2 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2adcae850e0420955da7cd29734dabd3ab1a73cf (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=330dfa31e3c1667394e1fd29250efc5cad0be9cc (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2308cebd46a6d4ba295796300ce87f161b6b1ce9 (commit)

Summary of changes:
 root/robots.txt.production |    2 --
 1 files changed, 0 insertions(+), 2 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 18dd3347a9e1a5dade7d6fab82cae2ef31b30ab2
Merge: 2308ceb 2adcae8
Author: warp <[email protected]>
Date:   Fri Feb 1 14:44:11 2013 +0100

    Merge remote-tracking branch 'freso/MBS-5766' into beta
    
    * freso/MBS-5766:
      MBS-5766: Re-add /url/ per discussion in ticket.
      Remove /release/, /work/ and /url/ from robots.txt.


commit 2adcae850e0420955da7cd29734dabd3ab1a73cf
Author: Frederik "Freso" S. Olesen <[email protected]>
Date:   Wed Jan 23 22:13:18 2013 +0100

    MBS-5766: Re-add /url/ per discussion in ticket.
    
    http://tickets.musicbrainz.org/browse/MBS-5766

diff --git a/root/robots.txt.production b/root/robots.txt.production
index ad12b4d..50b995b 100644
--- a/root/robots.txt.production
+++ b/root/robots.txt.production
@@ -22,5 +22,6 @@ Disallow: /taglookup
 Disallow: /test/
 Disallow: /tracklist/
 Disallow: /unit_tests/
+Disallow: /url/
 Disallow: /user/
 Disallow: /ws

commit 330dfa31e3c1667394e1fd29250efc5cad0be9cc
Author: Frederik "Freso" S. Olesen <[email protected]>
Date:   Tue Jan 22 00:47:38 2013 +0100

    Remove /release/, /work/ and /url/ from robots.txt.

diff --git a/root/robots.txt.production b/root/robots.txt.production
index 91091d1..ad12b4d 100644
--- a/root/robots.txt.production
+++ b/root/robots.txt.production
@@ -13,7 +13,6 @@ Disallow: /partners/
 Disallow: /puid/
 Disallow: /rating/
 Disallow: /recording/
-Disallow: /release/
 Disallow: /report/
 Disallow: /reports
 Disallow: /search
@@ -23,7 +22,5 @@ Disallow: /taglookup
 Disallow: /test/
 Disallow: /tracklist/
 Disallow: /unit_tests/
-Disallow: /url/
 Disallow: /user/
-Disallow: /work/
 Disallow: /ws

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


hooks/post-receive
-- 
mb_server