r113861 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113860‎ | r113861 | r113862 >
Date:21:37, 14 March 2012
Author:laner
Status:ok
Tags:
Comment:
Bad manual merges are bad. Moving hosts assignment to proper location.
Modified paths:
  • /trunk/tools/subversion/user-management/manage-volumes (modified) (history)

Diff [purge]

Index: trunk/tools/subversion/user-management/manage-volumes
@@ -60,12 +60,12 @@
6161 project_name = project[1]["cn"][0]
6262 hosts = []
6363 if project_name in project_hosts:
 64+ hosts = project_hosts[project_name]
6465 brick_ips = []
6566 for brick in self.bricks:
6667 brick_ips.append(socket.gethostbyname(brick))
6768 hosts.extend(brick_ips)
6869 hosts = list(set(hosts))
69 - hosts = project_hosts[project_name]
7070 hosts.sort()
7171 for volume_name in self.volume_names:
7272 volume_hosts = hosts

Status & tagging log