date:20130405

[MediaWiki-commits] [Gerrit] Add ack-grep, htop, curl & tree - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57713


Change subject: Add ack-grep, htop, curl & tree
..

Add ack-grep, htop, curl & tree

Change-Id: Iba197b8c6e7cfef18b93f29e85078c2321b55e7f
---
M Vagrantfile
A puppet/modules/misc/files/bash_aliases
M puppet/modules/misc/manifests/init.pp
3 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/13/57713/1

diff --git a/Vagrantfile b/Vagrantfile
index d2ba80c..fed30a7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,10 +2,13 @@
 # vi: set ft=ruby :
 require 'rbconfig'
 
+# Check if we're running on Windows.
 def windows?
 RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
 end
 
+# Get VirtualBox's version string by capturing the output of 'VBoxManage -v'.
+# Returns empty string if unable to determine version.
 def get_virtualbox_version
 begin
 if windows?
diff --git a/puppet/modules/misc/files/bash_aliases 
b/puppet/modules/misc/files/bash_aliases
new file mode 100755
index 000..3f212ec
--- /dev/null
+++ b/puppet/modules/misc/files/bash_aliases
@@ -0,0 +1,2 @@
+alias ..="cd .."
+alias ack=ack-grep
diff --git a/puppet/modules/misc/manifests/init.pp 
b/puppet/modules/misc/manifests/init.pp
index 8649577..b4deccb 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -34,4 +34,15 @@
refreshonly => true,
}
 
+   # Small, nifty, useful things
+   package { [ 'ack-grep', 'htop', 'curl', 'tree' ]:
+   ensure => present,
+   }
+
+   file { '/home/vagrant/.bash_aliases':
+   ensure => present,
+   mode   => '0755',
+   source => 'puppet:///modules/misc/bash_aliases',
+   }
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/57713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba197b8c6e7cfef18b93f29e85078c2321b55e7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Back to shallow clones by default, but parametrize Puppet class - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Back to shallow clones by default, but parametrize Puppet class
..


Back to shallow clones by default, but parametrize Puppet class

Change-Id: I3228923e4d96d2dba9a83605ca42db8500b24615
---
M puppet/modules/mediawiki/manifests/git.pp
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 13 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/puppet/modules/mediawiki/manifests/git.pp 
b/puppet/modules/mediawiki/manifests/git.pp
index 44090f4..2d0a742 100644
--- a/puppet/modules/mediawiki/manifests/git.pp
+++ b/puppet/modules/mediawiki/manifests/git.pp
@@ -1,7 +1,13 @@
 # Clone MediaWiki via Git
 class mediawiki::git(
-   $remote = 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git'
+   $remote = 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
+   $shallow = false
 ) {
+
+   $git_extra_args = $shallow ? {
+   true=> '--depth=1',
+   default => '',
+   }
 
exec { 'add-git-core-ppa':
command => 'add-apt-repository --yes ppa:git-core/ppa && 
apt-get update',
@@ -16,7 +22,7 @@
 
exec { 'git-clone-mediawiki':
creates   => '/vagrant/mediawiki/.git/refs/remotes',
-   command   => "git clone ${remote} /vagrant/mediawiki",
+   command   => "git clone ${git_extra_args} ${remote} 
/vagrant/mediawiki",
timeout   => 0,
logoutput => true,
}
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 78d22db..6b2e9fe 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -13,10 +13,11 @@
dbname   => $dbname,
password => $pass,
}
-
-   include git
-   include php
-   include phpsh
+   class { 'git':
+   shallow => true,
+   }
+   class { 'php': }
+   class { 'phpsh': }
 
apache::site { 'default':
ensure => absent,

-- 
To view, visit https://gerrit.wikimedia.org/r/57710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3228923e4d96d2dba9a83605ca42db8500b24615
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add ack-grep, htop, curl & tree - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Add ack-grep, htop, curl & tree
..


Add ack-grep, htop, curl & tree

Change-Id: Iba197b8c6e7cfef18b93f29e85078c2321b55e7f
---
M Vagrantfile
A puppet/modules/misc/files/bash_aliases
M puppet/modules/misc/manifests/init.pp
3 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/Vagrantfile b/Vagrantfile
index d2ba80c..fed30a7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,10 +2,13 @@
 # vi: set ft=ruby :
 require 'rbconfig'
 
+# Check if we're running on Windows.
 def windows?
 RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
 end
 
+# Get VirtualBox's version string by capturing the output of 'VBoxManage -v'.
+# Returns empty string if unable to determine version.
 def get_virtualbox_version
 begin
 if windows?
diff --git a/puppet/modules/misc/files/bash_aliases 
b/puppet/modules/misc/files/bash_aliases
new file mode 100755
index 000..3f212ec
--- /dev/null
+++ b/puppet/modules/misc/files/bash_aliases
@@ -0,0 +1,2 @@
+alias ..="cd .."
+alias ack=ack-grep
diff --git a/puppet/modules/misc/manifests/init.pp 
b/puppet/modules/misc/manifests/init.pp
index 8649577..b4deccb 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -34,4 +34,15 @@
refreshonly => true,
}
 
+   # Small, nifty, useful things
+   package { [ 'ack-grep', 'htop', 'curl', 'tree' ]:
+   ensure => present,
+   }
+
+   file { '/home/vagrant/.bash_aliases':
+   ensure => present,
+   mode   => '0755',
+   source => 'puppet:///modules/misc/bash_aliases',
+   }
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/57713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba197b8c6e7cfef18b93f29e85078c2321b55e7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Ensure default site is disabled before running setup - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57714


Change subject: Ensure default site is disabled before running setup
..

Ensure default site is disabled before running setup

Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/14/57714/1

diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 6b2e9fe..39d45ea 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -23,6 +23,11 @@
ensure => absent,
}
 
+   file { '/etc/apache2/sites-enabled/000-default':
+   ensure => absent,
+   before => Exec['mediawiki-setup'],
+   }
+
# If an auto-generated LocalSettings.php file exists but the database it
# refers to is missing, assume it is residual of a discarded instance 
and
# delete it.

-- 
To view, visit https://gerrit.wikimedia.org/r/57714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Ensure default site is disabled before running setup - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Ensure default site is disabled before running setup
..


Ensure default site is disabled before running setup

Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 6b2e9fe..d7241bb 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -23,6 +23,12 @@
ensure => absent,
}
 
+   file { '/etc/apache2/sites-enabled/000-default':
+   ensure  => absent,
+   require => Package['apache2'],
+   before  => Exec['mediawiki-setup'],
+   }
+
# If an auto-generated LocalSettings.php file exists but the database it
# refers to is missing, assume it is residual of a discarded instance 
and
# delete it.

-- 
To view, visit https://gerrit.wikimedia.org/r/57714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc9bd3d6791738532e8bb7a59ec374680b374edf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Puppetize supervisor configs for EventLogging - change (operations/puppet)

2013-04-05 Thread Faidon (Code Review)

Faidon has submitted this change and it was merged.

Change subject: Puppetize supervisor configs for EventLogging
..


Puppetize supervisor configs for EventLogging

This change puppetizes the EventLogging supervisor configuration, currently
running on vanadium.

This could be made a lot nicer. Ideally we'd have custom resource types for
supervisor-managed programs that generate a job-config file and plop it into
/etc/supervisor/conf.d. (
looks like a good generic implementation.)

It may even be desirable to have resource types or classes corresponding to the
different EventLogging daemons.

I intend to do that (...seriously, I do), but my goal is to first have the
setup 100% puppetized, and then iterate on abstractions.

Change-Id: I256d613f48e54afb9df5fa031d3f98288caab796
---
A modules/eventlogging/files/supervisord.conf
M modules/eventlogging/manifests/init.pp
A modules/eventlogging/manifests/supervisor.pp
A modules/eventlogging/templates/eventlogging.conf
4 files changed, 225 insertions(+), 1 deletion(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/eventlogging/files/supervisord.conf 
b/modules/eventlogging/files/supervisord.conf
new file mode 100644
index 000..9e435da
--- /dev/null
+++ b/modules/eventlogging/files/supervisord.conf
@@ -0,0 +1,26 @@
+; supervisor config
+; -
+; Managed by Puppet: puppet:///files/eventlogging/eventlogging.conf
+; For detailed explanations of these configuration variables, see the
+; supervisor docs at .
+
+[unix_http_server]
+file = /var/run//supervisor.sock
+
+[supervisord]
+logfile = /var/log/supervisor/supervisord.log
+pidfile = /var/run/supervisord.pid
+childlogdir = /var/log/supervisor
+environment = 
PYTHONIOENCODING=utf-8:ignore,PYTHONPATH=/srv/deployment/eventlogging/EventLogging/server,PATH=/srv/deployment/eventlogging/EventLogging/server/bin
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = 
supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run//supervisor.sock
+
+[inet_http_server]
+port = *:2828
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
diff --git a/modules/eventlogging/manifests/init.pp 
b/modules/eventlogging/manifests/init.pp
index 1af287a..4d5a14b 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -2,6 +2,7 @@
 # See 
 class eventlogging {
 
+   class { 'eventlogging::supervisor': }
class { 'eventlogging::ganglia': }
class { 'eventlogging::archive':
destinations => [ 'stat1.wikimedia.org' ],
@@ -12,7 +13,6 @@
'python-pygments',
'python-sqlalchemy',
'python-zmq',
-   'supervisor'
]:
ensure => present,
}
diff --git a/modules/eventlogging/manifests/supervisor.pp 
b/modules/eventlogging/manifests/supervisor.pp
new file mode 100644
index 000..270bab0
--- /dev/null
+++ b/modules/eventlogging/manifests/supervisor.pp
@@ -0,0 +1,31 @@
+# Use supervisor process management tool (a cousin of upstart and
+# daemontools) to start / stop / restart / monitor EventLogging processes.
+class eventlogging::supervisor {
+
+   require passwords::mysql::eventlogging  # RT 4752
+
+   package { 'supervisor':
+   ensure => present,
+   }
+
+   service { 'supervisor':
+   ensure  => running,
+   enable  => true,
+   require => Package['supervisor'],
+   }
+
+   file { '/etc/supervisor/supervisord.conf':
+   source  => 'puppet:///modules/eventlogging/supervisord.conf',
+   require => [ Package['supervisor'], Systemuser['eventlogging'] 
],
+   notify  => Service['supervisor'],
+   mode=> '0444',
+   }
+
+   file { '/etc/supervisor/conf.d/eventlogging.conf':
+   content => template('eventlogging/eventlogging.conf.erb'),
+   require => File['/etc/supervisor/supervisord.conf'],
+   notify  => Service['supervisor'],
+   mode=> '0444',
+   }
+
+}
diff --git a/modules/eventlogging/templates/eventlogging.conf 
b/modules/eventlogging/templates/eventlogging.conf
new file mode 100644
index 000..9555a1c
--- /dev/null
+++ b/modules/eventlogging/templates/eventlogging.conf
@@ -0,0 +1,167 @@
+; supervisor configuration for EventLogging
+; -
+; This file is managed by Puppet.
+
+; Data flow
+; -
+; - varnishncsa broadcasts UDP log data to vanadium on port 8422.
+; - MediaWiki broadcasts UDP log data to vanadium on port 8421.
+; - On Vanadium, each incoming UDP stream is re-broadcast over ZMQ (same port
+;   number, but TCP/IP). This is to allow for mul

[MediaWiki-commits] [Gerrit] [E3Experiments] Removed from WMF cluster - change (translatewiki)

2013-04-05 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57715


Change subject: [E3Experiments] Removed from WMF cluster
..

[E3Experiments] Removed from WMF cluster

https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=commitdiff;h=1d72fba3461ad3e0a94ea5425e6ade65e5a96203
Very WMF centric, unlikely to be used by third parties

Change-Id: I6070af1734010a16e46373290693fa0a75ea5e8b
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/15/57715/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 2306c33..145a59e 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -412,7 +412,9 @@
 
 Dynamic Sidebar
 
-E3 Experiments
+# Removed from WMF cluster: 
https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=commitdiff;h=1d72fba3461ad3e0a94ea5425e6ade65e5a96203
+# Very WMF centric, unlikely to be used by third parties
+# E3 Experiments
 
 Echo
 aliasfile = Echo/Echo.alias.php

-- 
To view, visit https://gerrit.wikimedia.org/r/57715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6070af1734010a16e46373290693fa0a75ea5e8b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [E3Experiments] Removed from WMF cluster - change (translatewiki)

2013-04-05 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [E3Experiments] Removed from WMF cluster
..


[E3Experiments] Removed from WMF cluster

https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=commitdiff;h=1d72fba3461ad3e0a94ea5425e6ade65e5a96203
Very WMF centric, unlikely to be used by third parties

Change-Id: I6070af1734010a16e46373290693fa0a75ea5e8b
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 2306c33..145a59e 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -412,7 +412,9 @@
 
 Dynamic Sidebar
 
-E3 Experiments
+# Removed from WMF cluster: 
https://gerrit.wikimedia.org/r/gitweb?p=operations/mediawiki-config.git;a=commitdiff;h=1d72fba3461ad3e0a94ea5425e6ade65e5a96203
+# Very WMF centric, unlikely to be used by third parties
+# E3 Experiments
 
 Echo
 aliasfile = Echo/Echo.alias.php

-- 
To view, visit https://gerrit.wikimedia.org/r/57715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6070af1734010a16e46373290693fa0a75ea5e8b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix eventlogging.conf template filename - change (operations/puppet)

2013-04-05 Thread Faidon (Code Review)

Faidon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57716


Change subject: Fix eventlogging.conf template filename
..

Fix eventlogging.conf template filename

Change-Id: Ie6c5ed34fecc184734561ab8f4de37e0a98d60fd
---
R modules/eventlogging/templates/eventlogging.conf.erb
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/57716/1

diff --git a/modules/eventlogging/templates/eventlogging.conf 
b/modules/eventlogging/templates/eventlogging.conf.erb
similarity index 100%
rename from modules/eventlogging/templates/eventlogging.conf
rename to modules/eventlogging/templates/eventlogging.conf.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/57716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6c5ed34fecc184734561ab8f4de37e0a98d60fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix eventlogging.conf template filename - change (operations/puppet)

2013-04-05 Thread Faidon (Code Review)

Faidon has submitted this change and it was merged.

Change subject: Fix eventlogging.conf template filename
..


Fix eventlogging.conf template filename

Change-Id: Ie6c5ed34fecc184734561ab8f4de37e0a98d60fd
---
R modules/eventlogging/templates/eventlogging.conf.erb
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/eventlogging/templates/eventlogging.conf 
b/modules/eventlogging/templates/eventlogging.conf.erb
similarity index 100%
rename from modules/eventlogging/templates/eventlogging.conf
rename to modules/eventlogging/templates/eventlogging.conf.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/57716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6c5ed34fecc184734561ab8f4de37e0a98d60fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon 
Gerrit-Reviewer: Faidon 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 46383) correct constructor fields for prototypes not us... - change (mediawiki...Wikibase)

2013-04-05 Thread Henning Snater (Code Review)

Henning Snater has submitted this change and it was merged.

Change subject: (bug 46383) correct constructor fields for prototypes not using 
wb.utilities.inherit (continuation)
..


(bug 46383) correct constructor fields for prototypes not using 
wb.utilities.inherit (continuation)

This has been done in Ied01e553d16dd0b161fa97ea25d33d9f4efd0447 for other 
constructors already
(mainly for the newer, data model related ones). This change set will do it for 
all other
constructors as well.

Change-Id: Ie9653a0e12804ffcd258a4a72ea278760b107315
---
M lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
M lib/resources/wikibase.RevisionStore.js
M lib/resources/wikibase.Site.js
M lib/resources/wikibase.serialization/serialization.SerializerFactory.js
M lib/resources/wikibase.store/store.FetchedContent.js
M lib/resources/wikibase.store/wikibase.EntityStore.js
M lib/resources/wikibase.ui.Base.js
M lib/resources/wikibase.ui.Toolbar.Label.js
M lib/resources/wikibase.ui.Toolbar.js
M lib/resources/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.js
M lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
11 files changed, 33 insertions(+), 32 deletions(-)

Approvals:
  Henning Snater: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
index a29adbf..99942c3 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
@@ -58,7 +58,7 @@
 
this._options = options;
};
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * The options object given in the constructor.
 * @type Object
@@ -151,6 +151,6 @@
$subject[0]
);
}
-   };
+   } );
 
 }( mediaWiki, wikibase, jQuery ) );
diff --git a/lib/resources/wikibase.RevisionStore.js 
b/lib/resources/wikibase.RevisionStore.js
index c2ba537..472c5ff 100644
--- a/lib/resources/wikibase.RevisionStore.js
+++ b/lib/resources/wikibase.RevisionStore.js
@@ -16,7 +16,7 @@
  * @constructor
  * @since 0.1
  */
-wb.RevisionStore = function( baseRev ) {
+var SELF = wb.RevisionStore = function( baseRev ) {
this._revisions = {
baseRevision: baseRev,
labelRevision: baseRev,
@@ -27,7 +27,7 @@
};
 };
 
-wb.RevisionStore.prototype = {
+$.extend( SELF.prototype, {
/**
 * Returns the base revision id.
 */
@@ -111,5 +111,5 @@
this._revisions.claimRevisions[claimGuid] = rev;
}
 
-};
-} )( mediaWiki, wikibase, jQuery );
+} );
+}( mediaWiki, wikibase, jQuery ) );
diff --git a/lib/resources/wikibase.Site.js b/lib/resources/wikibase.Site.js
index cf10686..ab615ec 100644
--- a/lib/resources/wikibase.Site.js
+++ b/lib/resources/wikibase.Site.js
@@ -16,10 +16,10 @@
  * @constructor
  * @since 0.1
  */
-wb.Site = function( siteDetails ) {
+var SELF = wb.Site = function( siteDetails ) {
this._siteDetails = siteDetails;
 };
-wb.Site.prototype = {
+$.extend( SELF.prototype, {
/**
 * Returns the sites id.
 */
@@ -148,5 +148,5 @@
return mw.util.wikiUrlencode( pageTitle );
}
 
-};
-} )( mediaWiki, wikibase, jQuery );
+} );
+}( mediaWiki, wikibase, jQuery ) );
diff --git 
a/lib/resources/wikibase.serialization/serialization.SerializerFactory.js 
b/lib/resources/wikibase.serialization/serialization.SerializerFactory.js
index 5aa476a..c601513 100644
--- a/lib/resources/wikibase.serialization/serialization.SerializerFactory.js
+++ b/lib/resources/wikibase.serialization/serialization.SerializerFactory.js
@@ -80,7 +80,7 @@
}
}
 
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * Returns a new serializer object suitable for a given object 
or for a given constructor's
 * instances.
@@ -117,7 +117,7 @@
 * @return wb.serialization.Unserializer
 */
newUnserializerFor: buildLookupFn( unserializers, 
'Unserializer' )
-   };
+   } );
 
/**
 * Registers a serializer for objects of a certain given constructor.
diff --git a/lib/resources/wikibase.store/store.FetchedContent.js 
b/lib/resources/wikibase.store/store.FetchedContent.js
index 7b47511..cdb7b20 100644
--- a/lib/resources/wikibase.store/store.FetchedContent.js
+++ b/lib/resources/wikibase.store/store.FetchedContent.js
@@ -48,7 +48,7 @@
this._data = data;
};
 
-   SELF.prototype = {
+   $.extend( SELF.prototype, {
/**
 * Returns the actual content.

[MediaWiki-commits] [Gerrit] Lowered fork count to 1 due to the procs being lowered and a... - change (operations/puppet)

2013-04-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57717


Change subject: Lowered fork count to 1 due to the procs being lowered and also 
not an even number now.
..

Lowered fork count to 1 due to the procs being lowered and also not an even 
number now.

Change-Id: Ib4cd47fdcac857f239a8b35af2b54a3e499d6776
---
M modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/57717/1

diff --git a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb 
b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
index 0c92f3a..f379f36 100755
--- a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
+++ b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
@@ -53,7 +53,7 @@
 # The procs parameter to runJobs.php.
 # Lower values keep the process pipeline fuller and lead to more
 # even picking of jobs from wikis, though more overhead is incurred.
-forkcount=2
+forkcount=1
 
 # default total memory limit (in kb) for this process and its sub-processes
 maxvirtualmemory=40

-- 
To view, visit https://gerrit.wikimedia.org/r/57717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4cd47fdcac857f239a8b35af2b54a3e499d6776
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add jobs for mw/ext/Foxway - change (integration/jenkins-job-builder-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Add jobs for mw/ext/Foxway
..


Add jobs for mw/ext/Foxway

Change-Id: I630423df11beb6f2a75668fcffb68694d436c262
---
M mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 3c94e45..0e18681 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -213,6 +213,7 @@
  - ExtensionDistributor
  - FeaturedFeeds
  - FormPreloadPostCache
+ - Foxway
  - FundraiserLandingPage
  - Gadgets
  - GeoCrumbs

-- 
To view, visit https://gerrit.wikimedia.org/r/56587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I630423df11beb6f2a75668fcffb68694d436c262
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Simple paging for translation search search results - change (mediawiki...Translate)

2013-04-05 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57718


Change subject: Simple paging for translation search search results
..

Simple paging for translation search search results

Bug: 46097
Change-Id: I3727311cf23989042c12825c7c015ba50db674fa
---
M TranslateSearch.i18n.php
M specials/SpecialSearchTranslations.php
2 files changed, 38 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/18/57718/1

diff --git a/TranslateSearch.i18n.php b/TranslateSearch.i18n.php
index 4db9b83..573e073 100644
--- a/TranslateSearch.i18n.php
+++ b/TranslateSearch.i18n.php
@@ -29,6 +29,8 @@
'tux-sst-solr-offline-title' => 'Search unavailable',
'tux-sst-solr-offline-body' => 'Search service is temporarily 
unavailable.',
 
+   'tux-sst-next' => 'Next results',
+   'tux-sst-prev' => 'Previous results',
 );
 
 /** Message documentation (Message documentation)
@@ -65,6 +67,9 @@
'tux-sst-solr-offline-body' => 'Used as error message.
 
 The page title for this message is {{msg-mw|tux-sst-solr-offline-title}}.',
+
+   'tux-sst-next' => 'Link to browser more search results',
+   'tux-sst-prev' => 'Link to browser more search results',
 );
 
 /** Asturian (asturianu)
diff --git a/specials/SpecialSearchTranslations.php 
b/specials/SpecialSearchTranslations.php
index e17434e..a7d3d47 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -23,6 +23,12 @@
 */
protected $hl = array();
 
+   /**
+* How many search results to display per page
+* @var int
+*/
+   protected $limit = 25;
+
public function __construct() {
parent::__construct( 'SearchTranslations' );
$this->hl = array(
@@ -145,13 +151,37 @@
$uri = wfAppendQuery( $document->uri, array( 
'action' => 'edit' ) );
$link = Html::element( 'a', array(
'href' => $uri,
-   ), $this->msg( 'tux-sst-edit' ) );
+   ), $this->msg( 'tux-sst-edit' )->text() );
$result .= Html::rawElement( 'div', array( 
'class' => 'row tux-edit tux-message-item' ), $link );
}
 
$result .= Html::closeElement( 'div' );
$results .= $result;
}
+
+   $prev = $next = '';
+   $total = $resultset->getNumFound();
+   $offset = $this->getRequest()->getInt( 'offset' );
+   $params = $this->getRequest()->getValues();
+
+   if ( $total - $offset > $this->limit ) {
+   $newParams = array( 'offset' => $offset + $this->limit 
) + $params;
+   $attribs = array(
+   'class' => 'pager-next',
+   'href' => $this->getTitle()->getLocalUrl( 
$newParams ),
+   );
+   $next = Html::element( 'a', $attribs, $this->msg( 
'tux-sst-next' )->text() );
+   }
+   if ( $offset ) {
+   $newParams = array( 'offset' => max( 0, $offset - 
$this->limit ) ) + $params;
+   $attribs = array(
+   'class' => 'pager-prev',
+   'href' => $this->getTitle()->getLocalUrl( 
$newParams ),
+   );
+   $prev = Html::element( 'a', $attribs, $this->msg( 
'tux-sst-prev' )->text() );
+   }
+
+   $results .= Html::rawElement( 'div', array(), "$prev $next" );
 
$search = $this->getSearchInput( $queryString );
$count = $this->msg( 'tux-sst-count' )->numParams( 
$resultset->getNumFound() );
@@ -164,7 +194,8 @@
$dismax = $query->getDisMax();
$dismax->setQueryParser( 'edismax' );
$query->setQuery( $queryString );
-   $query->setRows( 20 );
+   $query->setRows( $this->limit );
+   $query->setStart( $this->getRequest()->getInt( 'offset' ) );
 
list( $pre, $post ) = $this->hl;
$hl = $query->getHighlighting();

-- 
To view, visit https://gerrit.wikimedia.org/r/57718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3727311cf23989042c12825c7c015ba50db674fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] triggers for mw/ext/Foxway - change (integration/zuul-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57719


Change subject: triggers for mw/ext/Foxway
..

triggers for mw/ext/Foxway

It has PHPUnit tests \O/

Change-Id: If30f84802bbb48756afba0f04a573e34da60dcd9
---
M layout.yaml
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/19/57719/1

diff --git a/layout.yaml b/layout.yaml
index 4d53ca7..4eb43ae 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1207,6 +1207,22 @@
   - mwext-FormPreloadPostCache-merge:
 - mwext-FormPreloadPostCache-lint
 
+  - name: mediawiki/extensions/Foxway
+check:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint
+test:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint:
+  - mwext-Foxway-testextensions-master
+gate-and-submit:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint:
+  - mwext-Foxway-testextensions-master
+
   - name: mediawiki/extensions/FundraiserLandingPage
 check:
   - mwext-FundraiserLandingPage-merge:

-- 
To view, visit https://gerrit.wikimedia.org/r/57719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If30f84802bbb48756afba0f04a573e34da60dcd9
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Replaced some wfRandomString() calls with newRawUUIDv4() ones. - change (mediawiki/core)

2013-04-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57720


Change subject: Replaced some wfRandomString() calls with newRawUUIDv4() ones.
..

Replaced some wfRandomString() calls with newRawUUIDv4() ones.

Change-Id: I181d047d4261ddf15693ee8f6484eb2a1c9d6568
---
M includes/filebackend/lockmanager/LSLockManager.php
M includes/filebackend/lockmanager/MemcLockManager.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/57720/1

diff --git a/includes/filebackend/lockmanager/LSLockManager.php 
b/includes/filebackend/lockmanager/LSLockManager.php
index 97de8dc..60386ea 100644
--- a/includes/filebackend/lockmanager/LSLockManager.php
+++ b/includes/filebackend/lockmanager/LSLockManager.php
@@ -82,7 +82,7 @@
$this->connTimeout = 3; // use some sane amount
}
 
-   $this->session = wfRandomString( 32 ); // 128 bits
+   $this->session = UIDGenerator::newRawUUIDv4( 
UIDGenerator::QUICK_RAND );
}
 
/**
diff --git a/includes/filebackend/lockmanager/MemcLockManager.php 
b/includes/filebackend/lockmanager/MemcLockManager.php
index fafc588..28f206f 100644
--- a/includes/filebackend/lockmanager/MemcLockManager.php
+++ b/includes/filebackend/lockmanager/MemcLockManager.php
@@ -85,7 +85,7 @@
}
}
 
-   $this->session = wfRandomString( 32 );
+   $this->session = UIDGenerator::newRawUUIDv4( 
UIDGenerator::QUICK_RAND );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/57720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I181d047d4261ddf15693ee8f6484eb2a1c9d6568
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] triggers for mw/ext/Foxway - change (integration/zuul-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: triggers for mw/ext/Foxway
..


triggers for mw/ext/Foxway

It has PHPUnit tests \O/

Change-Id: If30f84802bbb48756afba0f04a573e34da60dcd9
---
M layout.yaml
1 file changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/layout.yaml b/layout.yaml
index 4d53ca7..4eb43ae 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1207,6 +1207,22 @@
   - mwext-FormPreloadPostCache-merge:
 - mwext-FormPreloadPostCache-lint
 
+  - name: mediawiki/extensions/Foxway
+check:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint
+test:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint:
+  - mwext-Foxway-testextensions-master
+gate-and-submit:
+  - mwext-Foxway-merge:
+- mwext-Foxway-jslint
+- mwext-Foxway-lint:
+  - mwext-Foxway-testextensions-master
+
   - name: mediawiki/extensions/FundraiserLandingPage
 check:
   - mwext-FundraiserLandingPage-merge:

-- 
To view, visit https://gerrit.wikimedia.org/r/57719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If30f84802bbb48756afba0f04a573e34da60dcd9
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Foxway)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57721


Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: Iaa6f91de20fd502ba09eed7bbfaee5e5a55ce7d6
---
A JENKINS
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway 
refs/changes/21/57721/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS

-- 
To view, visit https://gerrit.wikimedia.org/r/57721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa6f91de20fd502ba09eed7bbfaee5e5a55ce7d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Lowered fork count to 1 due to the procs being lowered and a... - change (operations/puppet)

2013-04-05 Thread Faidon (Code Review)

Faidon has submitted this change and it was merged.

Change subject: Lowered fork count to 1 due to the procs being lowered and also 
not an even number now.
..


Lowered fork count to 1 due to the procs being lowered and also not an even 
number now.

Change-Id: Ib4cd47fdcac857f239a8b35af2b54a3e499d6776
---
M modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb 
b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
index 0c92f3a..f379f36 100755
--- a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
+++ b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb
@@ -53,7 +53,7 @@
 # The procs parameter to runJobs.php.
 # Lower values keep the process pipeline fuller and lead to more
 # even picking of jobs from wikis, though more overhead is incurred.
-forkcount=2
+forkcount=1
 
 # default total memory limit (in kb) for this process and its sub-processes
 maxvirtualmemory=40

-- 
To view, visit https://gerrit.wikimedia.org/r/57717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4cd47fdcac857f239a8b35af2b54a3e499d6776
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Faidon 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Docblock syntax fix (no colon after param name) - change (mediawiki...EventLogging)

2013-04-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Docblock syntax fix (no colon after param name)
..


Docblock syntax fix (no colon after param name)

Also adds python-pymongo to recommended Ubuntu python packages in README.rst

Change-Id: Id1d0360821100e6e3131b6ff20b66d4605fd9b1c
---
M EventLogging.hooks.php
M EventLogging.php
M includes/JsonSchemaContent.php
M includes/JsonSchemaContentHandler.php
M includes/JsonSchemaHooks.php
M includes/RemoteSchema.php
M server/README.rst
7 files changed, 27 insertions(+), 27 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/EventLogging.hooks.php b/EventLogging.hooks.php
index 8a94355..95fe130 100644
--- a/EventLogging.hooks.php
+++ b/EventLogging.hooks.php
@@ -36,8 +36,8 @@
}
 
/**
-* @param $user object: The User object that was created.
-* @param $byEmail boolean The form has a [By e-mail] button.
+* @param User $user The User object that was created.
+* @param boolean $byEmail The form has a [By e-mail] button.
 * @return bool True
 */
public static function onAddNewAccount( $user, $byEmail ) {
diff --git a/EventLogging.php b/EventLogging.php
index 6c3c069..f269a02 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -91,9 +91,9 @@
  *
  * @see wfErrorLog
  *
- * @param string $schemaName: Schema name.
- * @param integer $revId: revision ID of schema
- * @param array $event: Map of event keys/vals.
+ * @param string $schemaName Schema name.
+ * @param int $revId revision ID of schema
+ * @param array $event Map of event keys/vals.
  * @return bool: Whether the event was logged.
  */
 function efLogServerSideEvent( $schemaName, $revId, $event ) {
@@ -156,8 +156,8 @@
  * Validates object against JSON Schema.
  *
  * @throws JsonSchemaException: If the object fails to validate.
- * @param array $object: Object to be validated.
- * @param array $schema: Schema to validate against (default: JSON Schema).
+ * @param array $object Object to be validated.
+ * @param array $schema Schema to validate against (default: JSON Schema).
  * @return bool: True.
  */
 function efSchemaValidate( $object, $schema = NULL ) {
diff --git a/includes/JsonSchemaContent.php b/includes/JsonSchemaContent.php
index 9ab83ee..38460d0 100644
--- a/includes/JsonSchemaContent.php
+++ b/includes/JsonSchemaContent.php
@@ -95,8 +95,8 @@
/**
 * Generate generic PHP and JavaScript code strings showing how to
 * use a schema.
-* @param $dbKey string DB key of schema article
-* @param $revId int Revision ID of schema article
+* @param string $dbKey DB key of schema article
+* @param int $revId Revision ID of schema article
 * @return array: Array mapping language names to source code
 */
public function getCodeSamples( $dbKey, $revId ) {
@@ -121,10 +121,10 @@
 *
 * @see https://mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi
 *
-* @param $title Title
-* @param $revId int|null Revision ID
-* @param $options ParserOptions|null
-* @param $generateHtml bool Whether or not to generate HTML
+* @param Title $title
+* @param int|null $revId Revision ID
+* @param ParserOptions|null $options
+* @param boolean $generateHtml Whether or not to generate HTML
 * @return ParserOutput
 */
public function getParserOutput( Title $title, $revId = null,
diff --git a/includes/JsonSchemaContentHandler.php 
b/includes/JsonSchemaContentHandler.php
index 0f2a939..fc37f9a 100644
--- a/includes/JsonSchemaContentHandler.php
+++ b/includes/JsonSchemaContentHandler.php
@@ -18,10 +18,10 @@
/**
 * Unserializes a JsonSchemaContent object.
 *
-* @param  $textstring   Serialized form of the content
-* @param  $format  null|string  The format used for serialization
+* @param string $text Serialized form of the content
+* @param null|string $format The format used for serialization
 *
-* @return Content  the JsonSchemaContent object wrapping $text
+* @return Content the JsonSchemaContent object wrapping $text
 */
public function unserializeContent( $text, $format = null ) {
$this->checkFormat( $format );
@@ -31,7 +31,7 @@
/**
 * Creates an empty JsonSchemaContent object.
 *
-* @return  Content
+* @return Content
 */
public function makeEmptyContent() {
return new JsonSchemaContent( '' );
diff --git a/includes/JsonSchemaHooks.php b/includes/JsonSchemaHooks.php
index ad5e402..3e111f8 100644
--- a/includes/JsonSchemaHooks.php
+++ b/includes/JsonSchemaHooks.php
@@ -37,7 +37,7 @@
 * Declares JSON as the code editor language for Schema: pa

[MediaWiki-commits] [Gerrit] * Refactoring, namespaces, cleanup - change (mediawiki...ZeroRatedMobileAccess)

2013-04-05 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57722


Change subject: * Refactoring, namespaces, cleanup
..

* Refactoring, namespaces, cleanup

This is the first patch in a series to refactor Zero Mobile extension.
* All classes moved to inclueds/ dir
* All classes moved to \Extensions\ZeroRatedMobileAccess namespace
* Removed unused ZeroRatedMobileTemplate
* ZeroRatedMobileAccess.body.php spltted up into two php files:
   class ExtZeroRatedMobileAccess => PageRenderingHooks.php
   class ZeroRatedMobileAccess => ZeroSpecialPage.php

Change-Id: Ic043db9d54cc39b975bcd9caaf08cb218ee5acec
---
M ZeroRatedMobileAccess.php
D ZeroRatedMobileAccessTemplate.php
R includes/PageRenderingHooks.php
A includes/ZeroSpecialPage.php
4 files changed, 55 insertions(+), 331 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess 
refs/changes/22/57722/1

diff --git a/ZeroRatedMobileAccess.php b/ZeroRatedMobileAccess.php
index 11b478e..f1aea19 100644
--- a/ZeroRatedMobileAccess.php
+++ b/ZeroRatedMobileAccess.php
@@ -19,7 +19,7 @@
 $wgExtensionCredits['other'][] = array(
'path'  =>  __FILE__,
'name'  =>  'ZeroRatedMobileAccess',
-   'version'  =>  '1.0.0',
+   'version'  =>  '1.1.0',
'author' => array( 'Patrick Reilly' ),
'descriptionmsg'  =>  'zero-rated-mobile-access-desc',
'url'  =>  
'https://www.mediawiki.org/wiki/Extension:ZeroRatedMobileAccess',
@@ -31,18 +31,20 @@
 // autoload extension classes
 
 $autoloadClasses = array (
-   'ZeroRatedMobileAccessTemplate' => 'ZeroRatedMobileAccessTemplate',
-   'ExtZeroRatedMobileAccess' => 'ZeroRatedMobileAccess.body',
-   'ZeroRatedMobileAccess' => 'ZeroRatedMobileAccess.body',
+   'PageRenderingHooks' => 'PageRenderingHooks',
+   'ZeroSpecialPage' => 'ZeroSpecialPage',
 );
 
+$ns = 'Extensions\ZeroRatedMobileAccess\\';
+$cwd = $cwd . 'includes' . DIRECTORY_SEPARATOR;
 foreach ( $autoloadClasses as $className => $classFilename ) {
-   $wgAutoloadClasses[$className] = $cwd . $classFilename . '.php';
+   $wgAutoloadClasses[$ns . $className] = $cwd . $classFilename . '.php';
 }
 
 $wgEnableZeroRatedMobileAccessTesting = false;
+$wgZeroRatedMobileAccessConfigIndexUri = false;
 
-$wgHooks['BeforePageDisplayMobile'][] = 
'ExtZeroRatedMobileAccess::onBeforePageDisplay';
-$wgHooks['GetMobileUrl'][] = 'ExtZeroRatedMobileAccess::getMobileUrl';
-$wgSpecialPages['ZeroRatedMobileAccess'] = 'ZeroRatedMobileAccess';
+$wgHooks['BeforePageDisplayMobile'][] = $ns . 
'PageRenderingHooks::onBeforePageDisplay';
+$wgHooks['GetMobileUrl'][] = $ns . 'PageRenderingHooks::getMobileUrl';
+$wgSpecialPages['ZeroRatedMobileAccess'] = $ns . 'ZeroSpecialPage';
 $wgSpecialPageGroups['ZeroRatedMobileAccess'] = 'other';
diff --git a/ZeroRatedMobileAccessTemplate.php 
b/ZeroRatedMobileAccessTemplate.php
deleted file mode 100644
index 05044df..000
--- a/ZeroRatedMobileAccessTemplate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-data = array();
-   }
-
-   /**
-* Sets the value $value to $name
-* @param $name
-* @param $value
-*/
-   public function set( $name, $value ) {
-   $this->data[$name] = $value;
-   }
-
-   /**
-* Sets the value $value to $name
-* @param $options array
-*/
-   public function setByArray( $options ) {
-   foreach ( $options as $name => $value ) {
-   $this->set( $name, $value );
-   }
-   }
-
-   /**
-* Gets the value of $name
-* @param $name
-* @return string
-*/
-   public function get( $name ) {
-   return $this->data[$name];
-   }
-
-   /**
-* Main function, used by classes that subclass 
ZeroRatedMobileAccessTemplate
-* to show the actual HTML output
-*/
-   abstract public function getHTML();
-}
diff --git a/ZeroRatedMobileAccess.body.php b/includes/PageRenderingHooks.php
similarity index 79%
rename from ZeroRatedMobileAccess.body.php
rename to includes/PageRenderingHooks.php
index 7c575e8..ac87dab 100644
--- a/ZeroRatedMobileAccess.body.php
+++ b/includes/PageRenderingHooks.php
@@ -1,30 +1,25 @@
 setHeaders();
-   }
-}
-
-class ExtZeroRatedMobileAccess {
+class PageRenderingHooks {
public static $renderZeroRatedLandingPage;
public static $renderZeroRatedBanner;
private static $formatMobileUrl = '//%s.zero.wikipedia.org/';
@@ -49,7 +44,7 @@
 * @return bool
 */
public static function onBeforePageDisplay( &$out, &$options ) {
-   $ext = new ExtZeroRatedMobileAccess();
+   $ext = new PageRenderingHooks();
return $ext->beforePageDisplayHTML( $out, $options );
}
 
@@ -308,7 +303,7 @@
$languageUrl = sprintf( 
s

[MediaWiki-commits] [Gerrit] generic puppet validation macro and job template - change (integration/jenkins-job-builder-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57723


Change subject: generic puppet validation macro and job template
..

generic puppet validation macro and job template

Being used for mediawiki/vagrant.git

Change-Id: Ie739e2e1793137bbea03ef5729ed56a9f54bb35c
---
M job-templates.yaml
M macro.yaml
A mediawiki-vagrant.yaml
3 files changed, 22 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/23/57723/1

diff --git a/job-templates.yaml b/job-templates.yaml
index 0ff8172..1ba0647 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -51,6 +51,16 @@
  - phpcs
 
 - job-template:
+name: '{name}-puppet-validate'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+builders:
+ - puppet-validate
+
+- job-template:
 name: '{name}-rubylint'
 defaults: use-zuul
 
diff --git a/macro.yaml b/macro.yaml
index 182d90a..7691f0f 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -294,6 +294,12 @@
 make
 make test
 
+- builder:
+name: puppet-validate
+builders:
+ - shell: |
+find . -type f -name '*.pp' -print0 | xargs -0 puppet parser validate
+
 # Run ruby syntax check against any file named '.rb' under the workspace.
 # The ruby interpreter is passed using 'interpreter'
 - builder:
diff --git a/mediawiki-vagrant.yaml b/mediawiki-vagrant.yaml
new file mode 100644
index 000..e02196d
--- /dev/null
+++ b/mediawiki-vagrant.yaml
@@ -0,0 +1,6 @@
+- project:
+name: 'mediawiki-vagrant'
+gerrit-name: 'mediawiki/vagrant'
+
+jobs:
+ - '{name}-puppet-validate'

-- 
To view, visit https://gerrit.wikimedia.org/r/57723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie739e2e1793137bbea03ef5729ed56a9f54bb35c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] generic puppet validation macro and job template - change (integration/jenkins-job-builder-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: generic puppet validation macro and job template
..


generic puppet validation macro and job template

Being used for mediawiki/vagrant.git

Change-Id: Ie739e2e1793137bbea03ef5729ed56a9f54bb35c
---
M job-templates.yaml
M macro.yaml
A mediawiki-vagrant.yaml
3 files changed, 22 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/job-templates.yaml b/job-templates.yaml
index 0ff8172..1ba0647 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -51,6 +51,16 @@
  - phpcs
 
 - job-template:
+name: '{name}-puppet-validate'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+builders:
+ - puppet-validate
+
+- job-template:
 name: '{name}-rubylint'
 defaults: use-zuul
 
diff --git a/macro.yaml b/macro.yaml
index 182d90a..7691f0f 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -294,6 +294,12 @@
 make
 make test
 
+- builder:
+name: puppet-validate
+builders:
+ - shell: |
+find . -type f -name '*.pp' -print0 | xargs -0 puppet parser validate
+
 # Run ruby syntax check against any file named '.rb' under the workspace.
 # The ruby interpreter is passed using 'interpreter'
 - builder:
diff --git a/mediawiki-vagrant.yaml b/mediawiki-vagrant.yaml
new file mode 100644
index 000..e02196d
--- /dev/null
+++ b/mediawiki-vagrant.yaml
@@ -0,0 +1,6 @@
+- project:
+name: 'mediawiki-vagrant'
+gerrit-name: 'mediawiki/vagrant'
+
+jobs:
+ - '{name}-puppet-validate'

-- 
To view, visit https://gerrit.wikimedia.org/r/57723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie739e2e1793137bbea03ef5729ed56a9f54bb35c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Updated readme file - change (qa/browsertests)

2013-04-05 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57724


Change subject: Updated readme file
..

Updated readme file

Now it points to new file that holds Ruby version.

Change-Id: I385db302a3d962114acca5689a03a70a47d1ce57
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/24/57724/1

diff --git a/README.md b/README.md
index 73a90b6..0650b25 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Environment
 
-To run the Selenium tests you will have to install Ruby (look at `.rvmrc` file 
for the exact version), the latest versions of RubyGems and Firefox (the 
default browser in which the tests run). The easiest way to install Ruby on 
Linux/Unix is [RVM](https://rvm.io/) and on Windows 
[RubyInstaller](http://rubyinstaller.org/).
+To run the Selenium tests you will have to install Ruby (look at 
`.ruby-version` file for the exact version), the latest versions of RubyGems 
and Firefox (the default browser in which the tests run). The easiest way to 
install Ruby on Linux/Unix is [RVM](https://rvm.io/) and on Windows 
[RubyInstaller](http://rubyinstaller.org/).
 
 Update RubyGems and install the required RubyGems:
 

-- 
To view, visit https://gerrit.wikimedia.org/r/57724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I385db302a3d962114acca5689a03a70a47d1ce57
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] update location of interwiki.cdb link in noc - change (operations/mediawiki-config)

2013-04-05 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57725


Change subject: update location of interwiki.cdb link in noc
..

update location of interwiki.cdb link in noc

Change-Id: I844f5b7dbf5192b7709dd2d4ed272a1fe44d3f1b
---
M docroot/noc/interwiki/interwiki.cdb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/25/57725/1

diff --git a/docroot/noc/interwiki/interwiki.cdb 
b/docroot/noc/interwiki/interwiki.cdb
index e04db26..2d45fb6 12
--- a/docroot/noc/interwiki/interwiki.cdb
+++ b/docroot/noc/interwiki/interwiki.cdb
@@ -1 +1 @@
-/home/wikipedia/common/php/cache/interwiki.cdb
\ No newline at end of file
+/home/wikipedia/common/wmf-config/interwiki.cdb
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/57725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I844f5b7dbf5192b7709dd2d4ed272a1fe44d3f1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Have Jenkins check / gate & submit mediawiki/vagrant - change (integration/zuul-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: Have Jenkins check / gate & submit mediawiki/vagrant
..


Have Jenkins check / gate & submit mediawiki/vagrant

Runs puppet-validate checks. Untested.

Change-Id: I102dc1c6ea0dc5fbf18a577ec39794597eab7cb0
---
M layout.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index 4eb43ae..e65131c 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -468,6 +468,12 @@
  - mw-tools-codeutils-pep8
  - mw-tools-codeutils-phplint
 
+  - name: mediawiki/vagrant
+check-voter:
+  - mediawiki-vagrant-puppet-validate
+gate-and-submit:
+  - mediawiki-vagrant-puppet-validate
+
   - name: operations/apache-config
 # FIXME: convert back to "check" pipeline whenever we have
 # integration tests

-- 
To view, visit https://gerrit.wikimedia.org/r/57452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I102dc1c6ea0dc5fbf18a577ec39794597eab7cb0
Gerrit-PatchSet: 3
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] statementview/snaklistview refactoring - change (mediawiki...Wikibase)

2013-04-05 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57726


Change subject: statementview/snaklistview refactoring
..

statementview/snaklistview refactoring

Removed redundant code from statementview and snaklistview and moved some 
documentation.
The statementview widget does not trigger its own API request saving a (new) 
reference
anymore. The statementview-specific code reacting on adding a new reference has 
been
moved to the "afterstopediting" event handling.

Change-Id: I4b6ccc8873273c8b319a129980bf745185569679
---
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
4 files changed, 35 insertions(+), 106 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/26/57726/1

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
index 22c0305..4ad958a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
@@ -16,8 +16,7 @@
  * @since 0.4
  *
  * @option {*|null} value The values displayed by this view. Each value is 
represented by a widget
- * defined in the 'listItemAdapter' option. If 'value' is null, this 
view will only display
- * an add button, for adding new values (at least if 'showAddButton' 
is not set to false).
+ * defined in the 'listItemAdapter' option.
  *
  * @option {jQuery.wikibase.listview.ListItemAdapter} listItemAdapter 
(required) Can not
  * be changed after initialization.
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 628a5a2..ae0bde1 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -14,11 +14,26 @@
 /**
  * View for displaying and editing Wikibase Statements.
  *
+ * @option statementGuid {string} (REQUIRED) The GUID of the statement the 
reference belongs to.
+ *
+ * @event toggleerror: Triggered when an error occurred or is resolved.
+ *(1) {jQuery.Event} event
+ *(2) {wb.RepoApiError|undefined} wb.RepoApiError object if an error 
occurred, undefined if
+ *the current error state is resolved.
+ *
  * @since 0.4
  * @extends jQuery.wikibase.snaklistview
  */
 $.widget( 'wikibase.referenceview', PARENT, {
widgetBaseClass: 'wb-referenceview',
+
+   /**
+* (Additional) default options.
+* @see jQuery.Widget.options
+*/
+   options: {
+   statementGuid: null
+   },
 
/**
 * Reference object represented by this view.
@@ -39,6 +54,10 @@
_create: function() {
var self = this;
 
+   if ( !this.option( 'statementGuid' ) ) {
+   throw new Error( 'Statement GUID required to initialize 
a reference view.')
+   }
+
if ( this.option( 'value' ) ) {
this._reference = this.option( 'value' );
// Overwrite the value since the parent snaklistview 
widget require a wb.SnakList
@@ -48,7 +67,7 @@
PARENT.prototype._create.call( this );
 
this.element.on( this.widgetName + 'stopediting.' + 
this.widgetName, function( event, dropValue ) {
-   if ( self.option( 'value' ) !== null && !dropValue && 
!self.__continueStopEditing ) {
+   if ( !dropValue && !self.__continueStopEditing ) {
self._saveReferenceApiCall()
.done( function( savedObject, pageInfo ) {
self.__continueStopEditing = true;
@@ -134,7 +153,7 @@
guid,
this.value().getSnaks(),
revStore.getClaimRevision( guid ),
-   this.value().getHash()
+   this.value().getHash() || null
).done( function( savedReference, pageInfo ) {
// update revision store
revStore.setClaimRevision( pageInfo.lastrevid, guid );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
index 644c2e1..a952bfe 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
@@ -49,13 +49,8 @@
  * @event disable: Triggered whenever the snaklistview gets disabled.
  *(1) {jQuery.Event} event
  *
- * @event enable

[MediaWiki-commits] [Gerrit] Moved configuration files to version specific subfolder - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57727


Change subject: Moved configuration files to version specific subfolder
..

Moved configuration files to version specific subfolder

Change-Id: Ia2225955e364761ea00679466b3eacc4b0dfa733
---
A configuration-1.19.0/TBEX.xml
A configuration-1.19.0/WpiSettings.php
A configuration-1.19.0/install.sql
A configuration-1.19.0/manifest.xml
A configuration-1.19.0/mediawiki/mw-wpi/index.php
A configuration-1.19.0/mediawiki/mw-wpi/index.php5
A configuration-1.19.0/mediawiki/mw-wpi/overrides.php
A configuration-1.19.0/parameters.xml
8 files changed, 817 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI 
refs/changes/27/57727/1

diff --git a/configuration-1.19.0/TBEX.xml b/configuration-1.19.0/TBEX.xml
new file mode 100644
index 000..f0270ed
--- /dev/null
+++ b/configuration-1.19.0/TBEX.xml
@@ -0,0 +1,95 @@
+
+
+  
+
+  Start Here
+  Complete MediaWiki Installation.
+  /index.php
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+
+  About MediaWiki
+  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
+  http://www.mediawiki.org/wiki/MediaWiki
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  System admin hub - Everything for the system 
administrator.
+  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
+  http://www.mediawiki.org/wiki/Sysadmin_hub
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
+
+
+  Community
+  Find: Forums, Documentation, FAQ's and Help
+  http://www.mediawiki.org/wiki/Project:Help
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  Developmer hub
+  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
+  http://www.mediawiki.org/wiki/Developer_hub
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+
+  Windows Azure Storage
+  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
+  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+   
+  
+
+  Site Admin
+  /index.php?title=Special%3ASpecialPages
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+  
+
+  
+
+  web.config
+
+
+  bin
+
+
+  docs
+
+
+  extensions
+
+
+  images
+
+
+  includes
+
+
+  languages
+
+
+  maintenance
+
+
+  mw-config
+
+
+  mw-wpi
+
+
+  resources
+
+
+  serialized
+
+
+  tests
+
+
+  *.php
+
+
+  
+
+
\ No newline at end of file
diff --git a/configuration-1.19.0/WpiSettings.php 
b/configuration-1.19.0/WpiSettings.php
new file mode 100644
index 000..2daff13
--- /dev/null
+++ b/configuration-1.19.0/WpiSettings.php
@@ -0,0 +1,26 @@
+ 'PlaceholderForLanguage',
+   //Screen2
+   'dbserver' => 'PlaceholderForDbServer',
+   'dbname' => 'PlaceholderForDbName',
+   'dbprefix' => 'PlaceholderForDbPrefix',
+   'dbuser' => 'PlaceholderForDbUsername',
+   'dbpass' => 'PlaceholderForDbPassword',
+   'installdbuser' => 'PlaceholderForDbAdminUsername',
+   'installdbpass' => 'PlaceholderForDbAdminPassword',
+   //Screen3
+   'sitename' => 'PlaceholderForSitename',
+   'adminname' => 'PlaceholderForAdminname',
+   'pass' => 'PlaceholderForAdminpass',
+   
+   'scriptpath' => 'PlaceholderForScriptPath',
+   'enablefileupload' => 'PlaceholderForFileUpload',
+   'usewindowsazure' => 'PlaceholderForUseAzure',
+   'azurehost' => 'PlaceholderForAzureHost',
+   'azureaccount' => 'PlaceholderForAzureAccount',
+   'azurekey' => 'PlaceholderForAzureKey',
+'wikiId' => 'PlaceholderForWikiId'
+   );
\ No newline at end of file
diff --git a/configuration-1.19.0/inst

[MediaWiki-commits] [Gerrit] Added configuration for 1.20.3 version - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57728


Change subject: Added configuration for 1.20.3 version
..

Added configuration for 1.20.3 version

Change-Id: Iefb3bf77252386fef1fb5123edacd2b163e4c990
---
A configuration-1.20.3/TBEX.xml
A configuration-1.20.3/WpiSettings.php
A configuration-1.20.3/install.sql
A configuration-1.20.3/manifest.xml
A configuration-1.20.3/mediawiki/mw-wpi/index.php
A configuration-1.20.3/mediawiki/mw-wpi/index.php5
A configuration-1.20.3/mediawiki/mw-wpi/overrides.php
A configuration-1.20.3/parameters.xml
8 files changed, 813 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI 
refs/changes/28/57728/1

diff --git a/configuration-1.20.3/TBEX.xml b/configuration-1.20.3/TBEX.xml
new file mode 100644
index 000..f0270ed
--- /dev/null
+++ b/configuration-1.20.3/TBEX.xml
@@ -0,0 +1,95 @@
+
+
+  
+
+  Start Here
+  Complete MediaWiki Installation.
+  /index.php
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+
+  About MediaWiki
+  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
+  http://www.mediawiki.org/wiki/MediaWiki
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  System admin hub - Everything for the system 
administrator.
+  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
+  http://www.mediawiki.org/wiki/Sysadmin_hub
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
+
+
+  Community
+  Find: Forums, Documentation, FAQ's and Help
+  http://www.mediawiki.org/wiki/Project:Help
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  Developmer hub
+  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
+  http://www.mediawiki.org/wiki/Developer_hub
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+
+  Windows Azure Storage
+  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
+  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+   
+  
+
+  Site Admin
+  /index.php?title=Special%3ASpecialPages
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+  
+
+  
+
+  web.config
+
+
+  bin
+
+
+  docs
+
+
+  extensions
+
+
+  images
+
+
+  includes
+
+
+  languages
+
+
+  maintenance
+
+
+  mw-config
+
+
+  mw-wpi
+
+
+  resources
+
+
+  serialized
+
+
+  tests
+
+
+  *.php
+
+
+  
+
+
\ No newline at end of file
diff --git a/configuration-1.20.3/WpiSettings.php 
b/configuration-1.20.3/WpiSettings.php
new file mode 100644
index 000..2daff13
--- /dev/null
+++ b/configuration-1.20.3/WpiSettings.php
@@ -0,0 +1,26 @@
+ 'PlaceholderForLanguage',
+   //Screen2
+   'dbserver' => 'PlaceholderForDbServer',
+   'dbname' => 'PlaceholderForDbName',
+   'dbprefix' => 'PlaceholderForDbPrefix',
+   'dbuser' => 'PlaceholderForDbUsername',
+   'dbpass' => 'PlaceholderForDbPassword',
+   'installdbuser' => 'PlaceholderForDbAdminUsername',
+   'installdbpass' => 'PlaceholderForDbAdminPassword',
+   //Screen3
+   'sitename' => 'PlaceholderForSitename',
+   'adminname' => 'PlaceholderForAdminname',
+   'pass' => 'PlaceholderForAdminpass',
+   
+   'scriptpath' => 'PlaceholderForScriptPath',
+   'enablefileupload' => 'PlaceholderForFileUpload',
+   'usewindowsazure' => 'PlaceholderForUseAzure',
+   'azurehost' => 'PlaceholderForAzureHost',
+   'azureaccount' => 'PlaceholderForAzureAccount',
+   'azurekey' => 'PlaceholderForAzureKey',
+'wikiId' => 'PlaceholderForWikiId'
+   );
\ No newline at end of file
diff --git a/configuration-1.20.3/install.sql b/configuration-1.20.3/ins

[MediaWiki-commits] [Gerrit] Moved configuration files to version specific subfolder - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has submitted this change and it was merged.

Change subject: Moved configuration files to version specific subfolder
..


Moved configuration files to version specific subfolder

Change-Id: Ia2225955e364761ea00679466b3eacc4b0dfa733
---
A configuration-1.19.0/TBEX.xml
A configuration-1.19.0/WpiSettings.php
A configuration-1.19.0/install.sql
A configuration-1.19.0/manifest.xml
A configuration-1.19.0/mediawiki/mw-wpi/index.php
A configuration-1.19.0/mediawiki/mw-wpi/index.php5
A configuration-1.19.0/mediawiki/mw-wpi/overrides.php
A configuration-1.19.0/parameters.xml
8 files changed, 817 insertions(+), 0 deletions(-)

Approvals:
  Mglaser: Verified; Looks good to me, approved



diff --git a/configuration-1.19.0/TBEX.xml b/configuration-1.19.0/TBEX.xml
new file mode 100644
index 000..f0270ed
--- /dev/null
+++ b/configuration-1.19.0/TBEX.xml
@@ -0,0 +1,95 @@
+
+
+  
+
+  Start Here
+  Complete MediaWiki Installation.
+  /index.php
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+
+  About MediaWiki
+  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
+  http://www.mediawiki.org/wiki/MediaWiki
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  System admin hub - Everything for the system 
administrator.
+  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
+  http://www.mediawiki.org/wiki/Sysadmin_hub
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
+
+
+  Community
+  Find: Forums, Documentation, FAQ's and Help
+  http://www.mediawiki.org/wiki/Project:Help
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  Developmer hub
+  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
+  http://www.mediawiki.org/wiki/Developer_hub
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+
+  Windows Azure Storage
+  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
+  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+   
+  
+
+  Site Admin
+  /index.php?title=Special%3ASpecialPages
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+  
+
+  
+
+  web.config
+
+
+  bin
+
+
+  docs
+
+
+  extensions
+
+
+  images
+
+
+  includes
+
+
+  languages
+
+
+  maintenance
+
+
+  mw-config
+
+
+  mw-wpi
+
+
+  resources
+
+
+  serialized
+
+
+  tests
+
+
+  *.php
+
+
+  
+
+
\ No newline at end of file
diff --git a/configuration-1.19.0/WpiSettings.php 
b/configuration-1.19.0/WpiSettings.php
new file mode 100644
index 000..2daff13
--- /dev/null
+++ b/configuration-1.19.0/WpiSettings.php
@@ -0,0 +1,26 @@
+ 'PlaceholderForLanguage',
+   //Screen2
+   'dbserver' => 'PlaceholderForDbServer',
+   'dbname' => 'PlaceholderForDbName',
+   'dbprefix' => 'PlaceholderForDbPrefix',
+   'dbuser' => 'PlaceholderForDbUsername',
+   'dbpass' => 'PlaceholderForDbPassword',
+   'installdbuser' => 'PlaceholderForDbAdminUsername',
+   'installdbpass' => 'PlaceholderForDbAdminPassword',
+   //Screen3
+   'sitename' => 'PlaceholderForSitename',
+   'adminname' => 'PlaceholderForAdminname',
+   'pass' => 'PlaceholderForAdminpass',
+   
+   'scriptpath' => 'PlaceholderForScriptPath',
+   'enablefileupload' => 'PlaceholderForFileUpload',
+   'usewindowsazure' => 'PlaceholderForUseAzure',
+   'azurehost' => 'PlaceholderForAzureHost',
+   'azureaccount' => 'PlaceholderForAzureAccount',
+   'azurekey' => 'PlaceholderForAzureKey',
+'wikiId' => 'PlaceholderForWikiId'
+   );
\ No newline at end of file
diff --git a/configuration-1.19.0/install.sql b/configuration-1.19.0/install.sql
new file mode 100644
i

[MediaWiki-commits] [Gerrit] Added configuration for 1.20.3 version - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has submitted this change and it was merged.

Change subject: Added configuration for 1.20.3 version
..


Added configuration for 1.20.3 version

Change-Id: Iefb3bf77252386fef1fb5123edacd2b163e4c990
---
A configuration-1.20.3/TBEX.xml
A configuration-1.20.3/WpiSettings.php
A configuration-1.20.3/install.sql
A configuration-1.20.3/manifest.xml
A configuration-1.20.3/mediawiki/mw-wpi/index.php
A configuration-1.20.3/mediawiki/mw-wpi/index.php5
A configuration-1.20.3/mediawiki/mw-wpi/overrides.php
A configuration-1.20.3/parameters.xml
8 files changed, 813 insertions(+), 0 deletions(-)

Approvals:
  Mglaser: Verified; Looks good to me, approved



diff --git a/configuration-1.20.3/TBEX.xml b/configuration-1.20.3/TBEX.xml
new file mode 100644
index 000..f0270ed
--- /dev/null
+++ b/configuration-1.20.3/TBEX.xml
@@ -0,0 +1,95 @@
+
+
+  
+
+  Start Here
+  Complete MediaWiki Installation.
+  /index.php
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+
+  About MediaWiki
+  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
+  http://www.mediawiki.org/wiki/MediaWiki
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  System admin hub - Everything for the system 
administrator.
+  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
+  http://www.mediawiki.org/wiki/Sysadmin_hub
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
+
+
+  Community
+  Find: Forums, Documentation, FAQ's and Help
+  http://www.mediawiki.org/wiki/Project:Help
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
+
+
+  Developmer hub
+  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
+  http://www.mediawiki.org/wiki/Developer_hub
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+
+  Windows Azure Storage
+  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
+  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
+  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
+
+   
+  
+
+  Site Admin
+  /index.php?title=Special%3ASpecialPages
+  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
+
+  
+
+  
+
+  web.config
+
+
+  bin
+
+
+  docs
+
+
+  extensions
+
+
+  images
+
+
+  includes
+
+
+  languages
+
+
+  maintenance
+
+
+  mw-config
+
+
+  mw-wpi
+
+
+  resources
+
+
+  serialized
+
+
+  tests
+
+
+  *.php
+
+
+  
+
+
\ No newline at end of file
diff --git a/configuration-1.20.3/WpiSettings.php 
b/configuration-1.20.3/WpiSettings.php
new file mode 100644
index 000..2daff13
--- /dev/null
+++ b/configuration-1.20.3/WpiSettings.php
@@ -0,0 +1,26 @@
+ 'PlaceholderForLanguage',
+   //Screen2
+   'dbserver' => 'PlaceholderForDbServer',
+   'dbname' => 'PlaceholderForDbName',
+   'dbprefix' => 'PlaceholderForDbPrefix',
+   'dbuser' => 'PlaceholderForDbUsername',
+   'dbpass' => 'PlaceholderForDbPassword',
+   'installdbuser' => 'PlaceholderForDbAdminUsername',
+   'installdbpass' => 'PlaceholderForDbAdminPassword',
+   //Screen3
+   'sitename' => 'PlaceholderForSitename',
+   'adminname' => 'PlaceholderForAdminname',
+   'pass' => 'PlaceholderForAdminpass',
+   
+   'scriptpath' => 'PlaceholderForScriptPath',
+   'enablefileupload' => 'PlaceholderForFileUpload',
+   'usewindowsazure' => 'PlaceholderForUseAzure',
+   'azurehost' => 'PlaceholderForAzureHost',
+   'azureaccount' => 'PlaceholderForAzureAccount',
+   'azurekey' => 'PlaceholderForAzureKey',
+'wikiId' => 'PlaceholderForWikiId'
+   );
\ No newline at end of file
diff --git a/configuration-1.20.3/install.sql b/configuration-1.20.3/install.sql
new file mode 100644
index 000..a7ffb5f
--- /dev/nul

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki/vagrant)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57729


Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I91adad7460d6db399dcb627b6ef4deaaef50523a
---
A JENKINS
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/29/57729/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS

-- 
To view, visit https://gerrit.wikimedia.org/r/57729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91adad7460d6db399dcb627b6ef4deaaef50523a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ruby 1.9 linter for MobileFrontend - change (integration/jenkins-job-builder-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57730


Change subject: ruby 1.9 linter for MobileFrontend
..

ruby 1.9 linter for MobileFrontend

Creates mwext-mobilefrontend-ruby1.9.3lint

bug: 46919
Change-Id: Idec018003b4ee1e12ce467bca3ab62adf6c4c96b
---
M mediawiki-extensions.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/30/57730/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 0e18681..2f2bd27 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -448,3 +448,9 @@
 
  - 'mwext-VisualEditor-doc-publish':
 ext-name: VisualEditor
+
+- project:
+name: 'mwext-mobilefrontend'
+gerrit-name: mediawiki/extensions/MobileFrontend
+jobs:
+ - '{name}-ruby1.9.3lint'

-- 
To view, visit https://gerrit.wikimedia.org/r/57730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idec018003b4ee1e12ce467bca3ab62adf6c4c96b
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] trigger ruby1.9 linter on mw/ext/MobileFrontend - change (integration/zuul-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57731


Change subject: trigger ruby1.9 linter on mw/ext/MobileFrontend
..

trigger ruby1.9 linter on mw/ext/MobileFrontend

bug: 46919
Change-Id: I592c6e748041e9b3785ff5f5f1ff977605d5460e
---
M layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/31/57731/1

diff --git a/layout.yaml b/layout.yaml
index e65131c..91abe79 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1545,11 +1545,13 @@
   - mwext-MobileFrontend-merge:
 - mwext-MobileFrontend-lint
 - mwext-MobileFrontend-jslint
+- mwext-MobileFrontend-ruby1.9.3lint
 gate-and-submit:
   - mwext-MobileFrontend-merge:
 - mwext-MobileFrontend-jslint
 - mwext-MobileFrontend-lint:
   - mwext-MobileFrontend-testextensions-master
+- mwext-MobileFrontend-ruby1.9.3lint
 
   - name: mediawiki/extensions/MoodBar
 check:

-- 
To view, visit https://gerrit.wikimedia.org/r/57731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592c6e748041e9b3785ff5f5f1ff977605d5460e
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ruby 1.9 linter for MobileFrontend - change (integration/jenkins-job-builder-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: ruby 1.9 linter for MobileFrontend
..


ruby 1.9 linter for MobileFrontend

Creates mwext-MobileFrontend-ruby1.9.3lint

bug: 46919
Change-Id: Idec018003b4ee1e12ce467bca3ab62adf6c4c96b
---
M mediawiki-extensions.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 0e18681..5d6bff9 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -448,3 +448,9 @@
 
  - 'mwext-VisualEditor-doc-publish':
 ext-name: VisualEditor
+
+- project:
+name: 'mwext-MobileFrontend'
+gerrit-name: mediawiki/extensions/MobileFrontend
+jobs:
+ - '{name}-ruby1.9.3lint'

-- 
To view, visit https://gerrit.wikimedia.org/r/57730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idec018003b4ee1e12ce467bca3ab62adf6c4c96b
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] trigger ruby1.9 linter on mw/ext/MobileFrontend - change (integration/zuul-config)

2013-04-05 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: trigger ruby1.9 linter on mw/ext/MobileFrontend
..


trigger ruby1.9 linter on mw/ext/MobileFrontend

bug: 46919
Change-Id: I592c6e748041e9b3785ff5f5f1ff977605d5460e
---
M layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index e65131c..91abe79 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1545,11 +1545,13 @@
   - mwext-MobileFrontend-merge:
 - mwext-MobileFrontend-lint
 - mwext-MobileFrontend-jslint
+- mwext-MobileFrontend-ruby1.9.3lint
 gate-and-submit:
   - mwext-MobileFrontend-merge:
 - mwext-MobileFrontend-jslint
 - mwext-MobileFrontend-lint:
   - mwext-MobileFrontend-testextensions-master
+- mwext-MobileFrontend-ruby1.9.3lint
 
   - name: mediawiki/extensions/MoodBar
 check:

-- 
To view, visit https://gerrit.wikimedia.org/r/57731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I592c6e748041e9b3785ff5f5f1ff977605d5460e
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...MobileFrontend)

2013-04-05 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57732


Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: Idf3cfe4cf816e69f53846d1d283674916b598983
---
A JENKINS
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/32/57732/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS

-- 
To view, visit https://gerrit.wikimedia.org/r/57732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf3cfe4cf816e69f53846d1d283674916b598983
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Wait for slaves to catch up on correct cluster - change (mediawiki...ArticleFeedbackv5)

2013-04-05 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57733


Change subject: Wait for slaves to catch up on correct cluster
..

Wait for slaves to catch up on correct cluster

Change-Id: I8c9597ffde511f54949fb931c2e2c31a492f794b
---
M maintenance/archiveFeedback.php
M maintenance/legacyToShard.php
M maintenance/setArchiveDate.php
3 files changed, 9 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/33/57733/1

diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index dc78c10..765df31 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -52,7 +52,8 @@
 * it works similar to any other action plus caches will update nicely.
 */
public function execute() {
-   global $wgArticleFeedbackAutoArchiveEnabled;
+   global $wgArticleFeedbackv5Cluster, 
$wgArticleFeedbackAutoArchiveEnabled;
+
if ( !$wgArticleFeedbackAutoArchiveEnabled ) {
$this->output( 'IMPORTANT! Auto-archive is currently 
disabled. To enable, set $wgArticleFeedbackAutoArchiveEnabled = true.'."\n" );
} else {
@@ -101,7 +102,7 @@
$this->output( "--moved to entry 
#$feedback->aft_id\n" );
}
 
-   wfWaitForSlaves();
+   wfWaitForSlaves( false, false, 
$wgArticleFeedbackv5Cluster );
 
if ( $break ) {
break;
diff --git a/maintenance/legacyToShard.php b/maintenance/legacyToShard.php
index c45927b..5034a18 100644
--- a/maintenance/legacyToShard.php
+++ b/maintenance/legacyToShard.php
@@ -46,6 +46,8 @@
 * @return bool
 */
protected function doDBUpdates() {
+   global $wgArticleFeedbackv5Cluster;
+
$dbr = $this->getDB( DB_SLAVE );
if ( !$dbr->tableExists( 'aft_article_feedback' ) ) {
// not necessary to run, there is no source data
@@ -61,7 +63,7 @@
$continue = 0;
while ( $continue !== null ) {
$continue = $this->moveBatch( $continue );
-   wfWaitForSlaves();
+   wfWaitForSlaves( false, false, 
$wgArticleFeedbackv5Cluster );
 
if ( $continue ) {
$this->output( "--moved to entry #$continue\n" 
);
diff --git a/maintenance/setArchiveDate.php b/maintenance/setArchiveDate.php
index a9096c8..6c60a7b 100644
--- a/maintenance/setArchiveDate.php
+++ b/maintenance/setArchiveDate.php
@@ -48,6 +48,8 @@
 * @return bool
 */
protected function doDBUpdates() {
+   global $wgArticleFeedbackv5Cluster;
+
$this->output( "Fixing archive dates.\n" );
 
/**
@@ -92,7 +94,7 @@
$next = $offset;
}
 
-   wfWaitForSlaves();
+   wfWaitForSlaves( false, false, 
$wgArticleFeedbackv5Cluster );
 
if ( $break ) {
break;

-- 
To view, visit https://gerrit.wikimedia.org/r/57733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c9597ffde511f54949fb931c2e2c31a492f794b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added "cluster" parameter to wfWaitForSlaves() for external ... - change (mediawiki/core)

2013-04-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Added "cluster" parameter to wfWaitForSlaves() for external DBs.
..


Added "cluster" parameter to wfWaitForSlaves() for external DBs.

Change-Id: I226a1793dfb901de8e1c0ac40c1dc3ad890de95a
---
M includes/GlobalFunctions.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Parent5446: Looks good to me, but someone else must approve
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7d54cb8..033abf9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3619,9 +3619,12 @@
  *
  * @param $maxLag Integer (deprecated)
  * @param $wiki mixed Wiki identifier accepted by wfGetLB
+ * @param $cluster string cluster name accepted by LBFactory
  */
-function wfWaitForSlaves( $maxLag = false, $wiki = false ) {
-   $lb = wfGetLB( $wiki );
+function wfWaitForSlaves( $maxLag = false, $wiki = false, $cluster = false ) {
+   $lb = ( $cluster !== false )
+   ? wfGetLBFactory()->getExternalLB( $cluster )
+   : wfGetLB( $wiki );
// bug 27975 - Don't try to wait for slaves if there are none
// Prevents permission error when getting master position
if ( $lb->getServerCount() > 1 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/57677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I226a1793dfb901de8e1c0ac40c1dc3ad890de95a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add parentheses (version 0.0.5) - change (mediawiki...Foxway)

2013-04-05 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57734


Change subject: add parentheses (version 0.0.5)
..

add parentheses (version 0.0.5)

echo (2 + 5) * 10; //  = 70

Change-Id: Ibef80651fadbe397fcb27520a970b4a1975fb415
---
M Foxway.php
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
4 files changed, 67 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway 
refs/changes/34/57734/1

diff --git a/Foxway.php b/Foxway.php
index 4b5fa19..e2e49dc 100644
--- a/Foxway.php
+++ b/Foxway.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-define( 'Foxway_VERSION' , '0.0.4' );
+define( 'Foxway_VERSION' , '0.0.5' );
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 4d743f8..3fd83c1 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -24,6 +24,7 @@
$expectListParams = false;
$expectCurlyClose = false;
$expectQuotesClose = false;
+   $parenthesesLevel = 0;
$incrementVariable = false;
$variableName = null;
$variableValue = null;
@@ -51,6 +52,17 @@
break;
case ',':
$runtime->separateParams();
+   break;
+   case '(':
+   $parenthesesLevel++;
+   $runtime->parenthesesOpen();
+   break;
+   case ')':
+   $parenthesesLevel--;
+   $runtime->parenthesesClose();
+   if( $parenthesesLevel == 0 ) {
+   
unset($expected[array_search(')', $expected)]);
+   }
break;
case '=':
case T_CONCAT_EQUAL:// .=
@@ -146,6 +158,9 @@
$expected[] = 
T_INC;
$expected[] = 
T_DEC;
}
+   if( $parenthesesLevel ) 
{
+   $expected[] = 
')';
+   }
}
if( $expectListParams ) {
$expected[] = ',';
@@ -217,6 +232,9 @@
if($expectListParams){
$expected[] = ',';
}
+   if( $parenthesesLevel ) {
+   $expected[] = ')';
+   }
break;
case T_ECHO:
$expectListParams = true;
@@ -257,6 +275,7 @@
'"',
'-',
'+',
+   '(',
);
break;
case T_CURLY_OPEN:
diff --git a/includes/Runtime.php b/includes/Runtime.php
index 40ca3d0..36199e7 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -50,7 +50,7 @@
}
 
private function pushStack() {
-   $this->stack[] = array($this->lastCommand, $this->lastDebug, 
$this->lastParam, $this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory);
+   $this->stack[] = array($this->lastCommand, $this->lastDebug, 
$this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory);
$this->resetRegisters();
}
 
@@ -58,7 +58,7 @@
if( count($this->stack) == 0 ) {
$this->resetRegisters();
} else {
-   list($this->lastCommand, $this->lastDebug, 
$this->lastParam, $this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory) = array_pop($this-

[MediaWiki-commits] [Gerrit] claimview/claimlistview refactoring - change (mediawiki...Wikibase)

2013-04-05 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57735


Change subject: claimview/claimlistview refactoring
..

claimview/claimlistview refactoring

Removed the separate claimlistview's API request when adding a new claim. The 
claimlistview's
action when adding a new claim has been moved to the "afterstopediting" event 
handling.

Change-Id: I0b9ac927efba5599bde5f25f760752dfac0e5d2d
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
3 files changed, 61 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/35/57735/1

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 135477b..2bb402c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -337,90 +337,10 @@
// first time the claim (or at least a part of it) drops out of 
edit mode:
// TODO: not nice to use the event of the main snak, perhaps 
the claimview could offer one!
$newClaim
-   .on( this._lmwEvent( 'stopediting' ), function( event, 
dropValue ) {
-   var newClaimview = self._lmwInstance( $newClaim ),
-   newSnak = newClaimview.$mainSnak.data( 
'snakview' ).snak();
-
-   if ( !self._lmwInstance( $newClaim ).isValid() && 
!dropValue ) {
-   event.preventDefault();
-   return;
-   }
-
-   if ( self.__continueStopEditing ) {
-   self.__continueStopEditing = false;
-   $newClaim.off( self._lmwEvent( 'stopediting' ) 
);
-   return;
-   }
-
-   if ( !dropValue ) {
-   event.preventDefault();
-   } else {
-   self.element.removeClass( 'wb-error' );
-   }
-
-   // TODO: right now, if the claim is not valid (e.g. 
because data type not yet
-   //   supported), the edit mode will close when 
saving without showing any hint!
-
-   if( !dropValue && newSnak ) {
-   // TODO: either change toggleActionMessage to 
do the disabling, then execute the
-   //   callback and finally execute the 
toggle animation, OR separate the
-   //   disabling and call it manually, then 
do the API call, then toggle.
-   var api = new wb.RepoApi(),
-   newClaim,
-   guidGenerator = new 
wb.utilities.ClaimGuidGenerator(),
-   guid = guidGenerator.newGuid( 
mw.config.get( 'wbEntityId' ) );
-
-   if ( newClaimview.$references ) {
-   newClaim = new wb.Statement(
-   newSnak,
-   null, // TODO: Qualifiers
-   [], // TODO: References
-   null, // TODO: Rank
-   guid
-   )
-   } else {
-   newClaim = new wb.Claim(
-   newSnak,
-   null, // TODO: Qualifiers
-   guid
-   )
-   }
-
-   api.setClaim( newClaim, 
wb.getRevisionStore().getBaseRevision() )
-   .done( function( newClaimWithGUID, pageInfo ) {
-   wb.getRevisionStore().setClaimRevision(
-   pageInfo.lastrevid,
-   newClaimWithGUID.getGuid()
-   );
-
-   // Continue stopEditing event by 
triggering it again skipping
-   // claimlistview's API call.
-   self.__continueStopEditing = true;
-
-   self._lmwInstance( $( event.target ) 
).stopEditing( dropValue );
-
-

[MediaWiki-commits] [Gerrit] Deleted configuration files that were copied to configuratio... - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57736


Change subject: Deleted configuration files that were copied to 
configuration-1.19.0
..

Deleted configuration files that were copied to configuration-1.19.0

Change-Id: I8d480f5676cd326d48414840491743fadc51c090
---
D TBEX.xml
D WpiSettings.php
D install.sql
D manifest.xml
D mediawiki/mw-wpi/index.php
D parameters.xml
6 files changed, 0 insertions(+), 750 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI 
refs/changes/36/57736/1

diff --git a/TBEX.xml b/TBEX.xml
deleted file mode 100644
index f0270ed..000
--- a/TBEX.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-  
-
-  Start Here
-  Complete MediaWiki Installation.
-  /index.php
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
-
-
-  About MediaWiki
-  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
-  http://www.mediawiki.org/wiki/MediaWiki
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
-
-
-  System admin hub - Everything for the system 
administrator.
-  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
-  http://www.mediawiki.org/wiki/Sysadmin_hub
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
-
-
-  Community
-  Find: Forums, Documentation, FAQ's and Help
-  http://www.mediawiki.org/wiki/Project:Help
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
-
-
-  Developmer hub
-  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
-  http://www.mediawiki.org/wiki/Developer_hub
-  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
-
-
-  Windows Azure Storage
-  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
-  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
-  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
-
-   
-  
-
-  Site Admin
-  /index.php?title=Special%3ASpecialPages
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
-
-  
-
-  
-
-  web.config
-
-
-  bin
-
-
-  docs
-
-
-  extensions
-
-
-  images
-
-
-  includes
-
-
-  languages
-
-
-  maintenance
-
-
-  mw-config
-
-
-  mw-wpi
-
-
-  resources
-
-
-  serialized
-
-
-  tests
-
-
-  *.php
-
-
-  
-
-
\ No newline at end of file
diff --git a/WpiSettings.php b/WpiSettings.php
deleted file mode 100644
index 2daff13..000
--- a/WpiSettings.php
+++ /dev/null
@@ -1,26 +0,0 @@
- 'PlaceholderForLanguage',
-   //Screen2
-   'dbserver' => 'PlaceholderForDbServer',
-   'dbname' => 'PlaceholderForDbName',
-   'dbprefix' => 'PlaceholderForDbPrefix',
-   'dbuser' => 'PlaceholderForDbUsername',
-   'dbpass' => 'PlaceholderForDbPassword',
-   'installdbuser' => 'PlaceholderForDbAdminUsername',
-   'installdbpass' => 'PlaceholderForDbAdminPassword',
-   //Screen3
-   'sitename' => 'PlaceholderForSitename',
-   'adminname' => 'PlaceholderForAdminname',
-   'pass' => 'PlaceholderForAdminpass',
-   
-   'scriptpath' => 'PlaceholderForScriptPath',
-   'enablefileupload' => 'PlaceholderForFileUpload',
-   'usewindowsazure' => 'PlaceholderForUseAzure',
-   'azurehost' => 'PlaceholderForAzureHost',
-   'azureaccount' => 'PlaceholderForAzureAccount',
-   'azurekey' => 'PlaceholderForAzureKey',
-'wikiId' => 'PlaceholderForWikiId'
-   );
\ No newline at end of file
diff --git a/install.sql b/install.sql
deleted file mode 100644
index a7ffb5f..000
--- a/install.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-USE PlaceholderForDbName;
-
-DROP PROCEDURE IF EXISTS add_user ;
-
-CREATE PROCEDURE add_user()
-BEGIN
-DECLARE EXIT HANDLER FOR 1044 BEGIN END;
-GRANT ALL PRIVILEGES ON PlaceholderForDbName.* to 
'PlaceholderForDbUsername'@

[MediaWiki-commits] [Gerrit] Deleted configuration files that were copied to configuratio... - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has submitted this change and it was merged.

Change subject: Deleted configuration files that were copied to 
configuration-1.19.0
..


Deleted configuration files that were copied to configuration-1.19.0

Change-Id: I8d480f5676cd326d48414840491743fadc51c090
---
D TBEX.xml
D WpiSettings.php
D install.sql
D manifest.xml
D mediawiki/mw-wpi/index.php
D parameters.xml
6 files changed, 0 insertions(+), 750 deletions(-)

Approvals:
  Mglaser: Verified; Looks good to me, approved



diff --git a/TBEX.xml b/TBEX.xml
deleted file mode 100644
index f0270ed..000
--- a/TBEX.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-  
-
-  Start Here
-  Complete MediaWiki Installation.
-  /index.php
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
-
-
-  About MediaWiki
-  MediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website.
-  http://www.mediawiki.org/wiki/MediaWiki
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
-
-
-  System admin hub - Everything for the system 
administrator.
-  This is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki..
-  http://www.mediawiki.org/wiki/Sysadmin_hub
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png
-
-
-  Community
-  Find: Forums, Documentation, FAQ's and Help
-  http://www.mediawiki.org/wiki/Project:Help
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png
-
-
-  Developmer hub
-  This is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers.
-  http://www.mediawiki.org/wiki/Developer_hub
-  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
-
-
-  Windows Azure Storage
-  This is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service.
-  http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage
-  
http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png
-
-   
-  
-
-  Site Admin
-  /index.php?title=Special%3ASpecialPages
-  
http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png
-
-  
-
-  
-
-  web.config
-
-
-  bin
-
-
-  docs
-
-
-  extensions
-
-
-  images
-
-
-  includes
-
-
-  languages
-
-
-  maintenance
-
-
-  mw-config
-
-
-  mw-wpi
-
-
-  resources
-
-
-  serialized
-
-
-  tests
-
-
-  *.php
-
-
-  
-
-
\ No newline at end of file
diff --git a/WpiSettings.php b/WpiSettings.php
deleted file mode 100644
index 2daff13..000
--- a/WpiSettings.php
+++ /dev/null
@@ -1,26 +0,0 @@
- 'PlaceholderForLanguage',
-   //Screen2
-   'dbserver' => 'PlaceholderForDbServer',
-   'dbname' => 'PlaceholderForDbName',
-   'dbprefix' => 'PlaceholderForDbPrefix',
-   'dbuser' => 'PlaceholderForDbUsername',
-   'dbpass' => 'PlaceholderForDbPassword',
-   'installdbuser' => 'PlaceholderForDbAdminUsername',
-   'installdbpass' => 'PlaceholderForDbAdminPassword',
-   //Screen3
-   'sitename' => 'PlaceholderForSitename',
-   'adminname' => 'PlaceholderForAdminname',
-   'pass' => 'PlaceholderForAdminpass',
-   
-   'scriptpath' => 'PlaceholderForScriptPath',
-   'enablefileupload' => 'PlaceholderForFileUpload',
-   'usewindowsazure' => 'PlaceholderForUseAzure',
-   'azurehost' => 'PlaceholderForAzureHost',
-   'azureaccount' => 'PlaceholderForAzureAccount',
-   'azurekey' => 'PlaceholderForAzureKey',
-'wikiId' => 'PlaceholderForWikiId'
-   );
\ No newline at end of file
diff --git a/install.sql b/install.sql
deleted file mode 100644
index a7ffb5f..000
--- a/install.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-USE PlaceholderForDbName;
-
-DROP PROCEDURE IF EXISTS add_user ;
-
-CREATE PROCEDURE add_user()
-BEGIN
-DECLARE EXIT HANDLER FOR 1044 BEGIN END;
-GRANT ALL PRIVILEGES ON PlaceholderForDbName.* to 
'PlaceholderForDbUsername'@'PlaceholderForDbServer' IDENTIFIED BY 
'PlaceholderForDbPassword

[MediaWiki-commits] [Gerrit] Added new package for MW 1.20.3 - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57737


Change subject: Added new package for MW 1.20.3
..

Added new package for MW 1.20.3

Change-Id: I99ff1be22445de80e40b364f5f3502cf50357b10
---
A mediawiki-1.20.3-IIS.zip
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI 
refs/changes/37/57737/1

diff --git a/mediawiki-1.20.3-IIS.zip b/mediawiki-1.20.3-IIS.zip
new file mode 100644
index 000..cea220f
--- /dev/null
+++ b/mediawiki-1.20.3-IIS.zip
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/57737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99ff1be22445de80e40b364f5f3502cf50357b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/packages/WPI
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 45002) additional experts for jQuery.valueview - change (mediawiki...DataValues)

2013-04-05 Thread Daniel Werner (Code Review)

Daniel Werner has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57738


Change subject: (bug 45002) additional experts for jQuery.valueview
..

(bug 45002) additional experts for jQuery.valueview

* Introduction of a "BifidExpert" which is an abstract valueview expert 
definition which requires
  two other expert constructors in an implementation. The bifid expert will 
choose one of the two
  other experts depending on the valueview's current mode. This allows greater 
flexibility when
  defining new experts and allows for sharing code more efficiently.
* SuggestedStringValue expert which is basically a StringValue expert plus 
suggester jQuery
  widget on top. Also see the TODOs in the documentation.
* Introduces a "StaticDom" expert which can be used together with the 
"BifidExpert".
* Reintroduction of special handling for string data values that should match 
the CommonsMedia
  data type definition. This is done with a CommonsMediaType expert. This 
expert is combining the
  three experts described above.
* Added the commons media support to MediaWiki's default expert factory.

Change-Id: Ibf778f2ab544ec51f8f9574eb32aea82a5707caf
---
M ValueView/ValueView.resources.mw.php
M ValueView/ValueView.resources.php
A ValueView/resources/jquery.valueview/valueview.BifidExpert.js
A 
ValueView/resources/jquery.valueview/valueview.experts/experts.CommonsMediaType.js
A ValueView/resources/jquery.valueview/valueview.experts/experts.StaticDom.js
A 
ValueView/resources/jquery.valueview/valueview.experts/experts.SuggestedStringValue.js
M ValueView/resources/mw.ext.valueView.js
7 files changed, 424 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/38/57738/1

diff --git a/ValueView/ValueView.resources.mw.php 
b/ValueView/ValueView.resources.mw.php
index 55227f3..8af3193 100644
--- a/ValueView/ValueView.resources.mw.php
+++ b/ValueView/ValueView.resources.mw.php
@@ -49,6 +49,7 @@
'dependencies' => array(
'jquery.valueview',
'jquery.valueview.experts.stringvalue',
+   'jquery.valueview.experts.commonsmediatype'
),
),
 
diff --git a/ValueView/ValueView.resources.php 
b/ValueView/ValueView.resources.php
index 9964c8c..f8c6032 100644
--- a/ValueView/ValueView.resources.php
+++ b/ValueView/ValueView.resources.php
@@ -143,6 +143,19 @@
'jquery.inputAutoExpand',
),
),
+
+   'jquery.valueview.experts.commonsmediatype' => $moduleTemplate 
+ array(
+   'scripts' => array(
+   'jquery.valueview/valueview.BifidExpert.js', // 
todo: define separate modules
+   
'jquery.valueview/valueview.experts/experts.StaticDom.js',
+   
'jquery.valueview/valueview.experts/experts.SuggestedStringValue.js',
+   
'jquery.valueview/valueview.experts/experts.CommonsMediaType.js',
+   ),
+   'dependencies' => array(
+   'jquery.valueview.experts.stringvalue',
+   'jquery.ui.suggester',
+   ),
+   ),
);
 
 } );
diff --git a/ValueView/resources/jquery.valueview/valueview.BifidExpert.js 
b/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
new file mode 100644
index 000..04c0007
--- /dev/null
+++ b/ValueView/resources/jquery.valueview/valueview.BifidExpert.js
@@ -0,0 +1,167 @@
+/**
+ * @file
+ * @ingroup ValueView
+ * @licence GNU GPL v2+
+ * @author Daniel Werner < daniel.wer...@wikimedia.de >
+ */
+( function( dv, vp, $, vv ) {
+   'use strict';
+
+   var PARENT = vv.Expert;
+
+   /**
+* Abstract definition of a Valueview expert whose responsibilities are 
shared by two valueview
+* experts; one taking over during edit mode, one being responsible 
while in static mode.
+*
+* @since 0.1
+*
+* @abstract
+* @constructor
+* @extends jQuery.valueview.Expert
+*/
+   vv.BifidExpert = dv.util.inherit( PARENT, {
+   /**
+* Constructor for the valueview expert responsible during 
static mode.
+* @type Function
+*/
+   _staticExpert: null,
+
+   /**
+* Options map, the constructor of "_staticExpert" will be 
initialized with.
+*/
+   _staticExpertOptions: null,
+
+   /**
+* Constructor for the valueview expert responsible during edit 
mode.
+* @type Function
+*/
+   _editableExpert: null,
+
+   /**

[MediaWiki-commits] [Gerrit] update location of interwiki.cdb link in noc - change (operations/mediawiki-config)

2013-04-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: update location of interwiki.cdb link in noc
..


update location of interwiki.cdb link in noc

Change-Id: I844f5b7dbf5192b7709dd2d4ed272a1fe44d3f1b
---
M docroot/noc/interwiki/interwiki.cdb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Demon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docroot/noc/interwiki/interwiki.cdb 
b/docroot/noc/interwiki/interwiki.cdb
index e04db26..5bb1522 12
--- a/docroot/noc/interwiki/interwiki.cdb
+++ b/docroot/noc/interwiki/interwiki.cdb
@@ -1 +1 @@
-/home/wikipedia/common/php/cache/interwiki.cdb
\ No newline at end of file
+/usr/local/apache/common/wmf-config/interwiki.cdb
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/57725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I844f5b7dbf5192b7709dd2d4ed272a1fe44d3f1b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: Demon 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Minor tweak to entry point code - change (mediawiki...Wikibase)

2013-04-05 Thread Daniel Werner (Code Review)

Daniel Werner has submitted this change and it was merged.

Change subject: Minor tweak to entry point code
..


Minor tweak to entry point code

Change-Id: I924f79cecaeb21ce311f80c6907064cfd91d3504
---
M Database/Database.php
M Query/Query.php
2 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  John Erling Blad: Looks good to me, but someone else must approve
  jenkins-bot: Checked



diff --git a/Database/Database.php b/Database/Database.php
index ab5e503..9adb3a0 100644
--- a/Database/Database.php
+++ b/Database/Database.php
@@ -30,9 +30,9 @@
 define( 'WIKIBASE_DATABASE_VERSION', '0.1 alpha' );
 
 // @codeCoverageIgnoreStart
-call_user_func( function() {
-   if ( defined( 'MEDIAWIKI' ) ) {
+if ( defined( 'MEDIAWIKI' ) ) {
+   call_user_func( function() {
require_once __DIR__ . '/Database.mw.php';
-   }
-} );
+   } );
+}
 // @codeCoverageIgnoreEnd
\ No newline at end of file
diff --git a/Query/Query.php b/Query/Query.php
index 6ff034f..3953dc3 100644
--- a/Query/Query.php
+++ b/Query/Query.php
@@ -30,9 +30,9 @@
 define( 'WIKIBASE_Query', '0.1 alpha' );
 
 // @codeCoverageIgnoreStart
-call_user_func( function() {
-   if ( defined( 'MEDIAWIKI' ) ) {
+if ( defined( 'MEDIAWIKI' ) ) {
+   call_user_func( function() {
require_once __DIR__ . '/Query.mw.php';
-   }
-} );
+   } );
+}
 // @codeCoverageIgnoreEnd
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/57453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I924f79cecaeb21ce311f80c6907064cfd91d3504
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Daniel Werner 
Gerrit-Reviewer: Henning Snater 
Gerrit-Reviewer: John Erling Blad 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add parentheses (version 0.0.5) - change (mediawiki...Foxway)

2013-04-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: add parentheses (version 0.0.5)
..


add parentheses (version 0.0.5)

echo (2 + 5) * 10; //  = 70

Change-Id: Ibef80651fadbe397fcb27520a970b4a1975fb415
---
M Foxway.php
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
4 files changed, 67 insertions(+), 9 deletions(-)

Approvals:
  Pastakhov: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Foxway.php b/Foxway.php
index 4b5fa19..e2e49dc 100644
--- a/Foxway.php
+++ b/Foxway.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-define( 'Foxway_VERSION' , '0.0.4' );
+define( 'Foxway_VERSION' , '0.0.5' );
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 4d743f8..3fd83c1 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -24,6 +24,7 @@
$expectListParams = false;
$expectCurlyClose = false;
$expectQuotesClose = false;
+   $parenthesesLevel = 0;
$incrementVariable = false;
$variableName = null;
$variableValue = null;
@@ -51,6 +52,17 @@
break;
case ',':
$runtime->separateParams();
+   break;
+   case '(':
+   $parenthesesLevel++;
+   $runtime->parenthesesOpen();
+   break;
+   case ')':
+   $parenthesesLevel--;
+   $runtime->parenthesesClose();
+   if( $parenthesesLevel == 0 ) {
+   
unset($expected[array_search(')', $expected)]);
+   }
break;
case '=':
case T_CONCAT_EQUAL:// .=
@@ -146,6 +158,9 @@
$expected[] = 
T_INC;
$expected[] = 
T_DEC;
}
+   if( $parenthesesLevel ) 
{
+   $expected[] = 
')';
+   }
}
if( $expectListParams ) {
$expected[] = ',';
@@ -217,6 +232,9 @@
if($expectListParams){
$expected[] = ',';
}
+   if( $parenthesesLevel ) {
+   $expected[] = ')';
+   }
break;
case T_ECHO:
$expectListParams = true;
@@ -257,6 +275,7 @@
'"',
'-',
'+',
+   '(',
);
break;
case T_CURLY_OPEN:
diff --git a/includes/Runtime.php b/includes/Runtime.php
index 40ca3d0..36199e7 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -50,7 +50,7 @@
}
 
private function pushStack() {
-   $this->stack[] = array($this->lastCommand, $this->lastDebug, 
$this->lastParam, $this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory);
+   $this->stack[] = array($this->lastCommand, $this->lastDebug, 
$this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory);
$this->resetRegisters();
}
 
@@ -58,7 +58,7 @@
if( count($this->stack) == 0 ) {
$this->resetRegisters();
} else {
-   list($this->lastCommand, $this->lastDebug, 
$this->lastParam, $this->listParams, $this->lastOperator, $this->lastNegative, 
$this->variableOperator, $this->mathMemory) = array_pop($this->stack);
+   list($thi

[MediaWiki-commits] [Gerrit] Changed null parser to be useful. - change (mediawiki...DataValues)

2013-04-05 Thread Henning Snater (Code Review)

Henning Snater has submitted this change and it was merged.

Change subject: Changed null parser to be useful.
..


Changed null parser to be useful.

Null parser will no longer wrap everything in an UnknownValue instance. If a 
DataValue instance is
given already, the same instance will be returned. If null is given, null will 
be returned.
Also extended related tests.

Change-Id: I6dfbf530c9779d3a820d6e0f7b96ef61c9cf7e4f
---
M ValueParsers/resources/ValueParser.js
M ValueParsers/resources/parsers/NullParser.js
M ValueParsers/tests/qunit/ValueParser.tests.js
M ValueParsers/tests/qunit/parsers/NullParser.tests.js
4 files changed, 19 insertions(+), 11 deletions(-)

Approvals:
  Henning Snater: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/ValueParsers/resources/ValueParser.js 
b/ValueParsers/resources/ValueParser.js
index b2f76bd..f9355e4 100644
--- a/ValueParsers/resources/ValueParser.js
+++ b/ValueParsers/resources/ValueParser.js
@@ -45,7 +45,7 @@
 * @param {*} rawValue
 *
 * @return $.Promise In the resolved callbacks the first 
parameter will be the parsed
-* DataValue object.
+* DataValue object or null for an empty value.
 */
parse: vp.util.abstractMember
 
diff --git a/ValueParsers/resources/parsers/NullParser.js 
b/ValueParsers/resources/parsers/NullParser.js
index 88a53af..f880ef7 100644
--- a/ValueParsers/resources/parsers/NullParser.js
+++ b/ValueParsers/resources/parsers/NullParser.js
@@ -6,14 +6,16 @@
  *
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-( function( mw, vp, dv, $, undefined ) {
+( function( mw, vp, dv, $ ) {
'use strict';
 
var PARENT = vp.ValueParser,
constructor = function() {};
 
/**
-* Constructor for null parsers.
+* Constructor for null parsers. Null parser will take any value for 
parsing. The parsed value
+* will be an UnknownValue data value except if null got passed in or a 
DataValue got passed in.
+* In those cases, the value given to the parse function will be the 
parse result.
 *
 * @constructor
 * @extends vp.ValueParser
@@ -31,11 +33,14 @@
 * @return $.Promise
 */
parse: function( rawValue ) {
-   var deferred = $.Deferred();
+   var deferred = $.Deferred(),
+   value = rawValue;
 
-   deferred.resolve( new dv.UnknownValue( rawValue ) );
+   if( value !== null && !( value instanceof dv.DataValue 
) ) {
+   value = new dv.UnknownValue( value );
+   }
 
-   return deferred.promise();
+   return deferred.resolve( value ).promise();
}
 
} );
diff --git a/ValueParsers/tests/qunit/ValueParser.tests.js 
b/ValueParsers/tests/qunit/ValueParser.tests.js
index 74ada28..265bd2d 100644
--- a/ValueParsers/tests/qunit/ValueParser.tests.js
+++ b/ValueParsers/tests/qunit/ValueParser.tests.js
@@ -119,13 +119,13 @@
assert.ok( true, 'parsing 
succeeded' );
 
assert.ok(
-   dataValue instanceof 
dv.DataValue,
-   'result ' + 
inputDetailMsg + 'is instanceof DataValue'
+   dataValue === null || ( 
dataValue instanceof dv.DataValue ),
+   'result ' + 
inputDetailMsg + 'is instanceof DataValue or null'
);
 
if( expected !== undefined ) {
assert.ok(
-   
dataValue.equals( expected ),
+   dataValue === 
expected || dataValue.equals( expected ),
'result ' + 
inputDetailMsg + 'is equal to the expected DataValue'
);
}
diff --git a/ValueParsers/tests/qunit/parsers/NullParser.tests.js 
b/ValueParsers/tests/qunit/parsers/NullParser.tests.js
index 1ef09a5..4648713 100644
--- a/ValueParsers/tests/qunit/parsers/NullParser.tests.js
+++ b/ValueParsers/tests/qunit/parsers/NullParser.tests.js
@@ -6,7 +6,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-( function( vp, dv, $, QUnit, undefined ) {
+( function( vp, dv, $, QUnit ) {
'use

[MediaWiki-commits] [Gerrit] (bug 45002) Created new extension folder for "ValueView" ext... - change (mediawiki...DataValues)

2013-04-05 Thread Henning Snater (Code Review)

Henning Snater has submitted this change and it was merged.

Change subject: (bug 45002) Created new extension folder for "ValueView" 
extension.
..


(bug 45002) Created new extension folder for "ValueView" extension.

In the following commits, the DataType's jQuery.valueview will be refactored 
into this extension.

Change-Id: I09698f72b2530db447ca75e733c3b821e1e4c736
---
M DataTypes/INSTALL
M DataValues.php
A ValueView/COPYING
A ValueView/INSTALL
A ValueView/README
A ValueView/RELEASE-NOTES
A ValueView/ValueView.i18n.php
A ValueView/ValueView.mw.php
A ValueView/ValueView.php
A ValueView/ValueView.resources.php
10 files changed, 594 insertions(+), 3 deletions(-)

Approvals:
  Henning Snater: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/DataTypes/INSTALL b/DataTypes/INSTALL
index fc59615..5e4df61 100644
--- a/DataTypes/INSTALL
+++ b/DataTypes/INSTALL
@@ -10,9 +10,9 @@
 
 * PHP 5.3 or above
 * DataValues
-* ValueFormatter
-* ValueParser
-* ValueValidator
+* ValueFormatters
+* ValueParsers
+* ValueValidators
 
 == Download ==
 
diff --git a/DataValues.php b/DataValues.php
index 61a1ecf..a478dcd 100644
--- a/DataValues.php
+++ b/DataValues.php
@@ -26,6 +26,7 @@
'ValueValidators',
'ValueFormatters',
'DataTypes',
+   'ValueView'
);
 
foreach ( $components as $component ) {
diff --git a/ValueView/COPYING b/ValueView/COPYING
new file mode 100644
index 000..ebba08a
--- /dev/null
+++ b/ValueView/COPYING
@@ -0,0 +1,347 @@
+The license text below "" applies to all files within this distribution, 
other
+than those that are in a directory which contains files named "LICENSE" or
+"COPYING", or a subdirectory thereof. For those files, the license text 
contained in
+said file overrides any license information contained in directories of 
smaller depth.
+Alternative licenses are typically used for software that is provided by 
external
+parties, and merely packaged with this software for convenience.
+
+
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and con

[MediaWiki-commits] [Gerrit] Added new package for MW 1.20.3 - change (mediawiki...WPI)

2013-04-05 Thread Mglaser (Code Review)

Mglaser has submitted this change and it was merged.

Change subject: Added new package for MW 1.20.3
..


Added new package for MW 1.20.3

Change-Id: I99ff1be22445de80e40b364f5f3502cf50357b10
---
A mediawiki-1.20.3-IIS.zip
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Mglaser: Verified; Looks good to me, approved



diff --git a/mediawiki-1.20.3-IIS.zip b/mediawiki-1.20.3-IIS.zip
new file mode 100644
index 000..cea220f
--- /dev/null
+++ b/mediawiki-1.20.3-IIS.zip
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/57737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I99ff1be22445de80e40b364f5f3502cf50357b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/packages/WPI
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add cp3006 to the pool - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57739


Change subject: Add cp3006 to the pool
..

Add cp3006 to the pool

Change-Id: I91ec11065bfc4c1a03915849fb1d52cf8f42dc03
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/57739/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e91cdd3..5f5b31e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -157,6 +157,7 @@
#'cp3003.esams.wikimedia.org',
'cp3004.esams.wikimedia.org',
'cp3005.esams.wikimedia.org',
+   'cp3006.esams.wikimedia.org',
'cp3009.esams.wikimedia.org',
'cp3010.esams.wikimedia.org',
],

-- 
To view, visit https://gerrit.wikimedia.org/r/57739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ec11065bfc4c1a03915849fb1d52cf8f42dc03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add cp3006 to the pool - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Add cp3006 to the pool
..


Add cp3006 to the pool

Change-Id: I91ec11065bfc4c1a03915849fb1d52cf8f42dc03
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e91cdd3..5f5b31e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -157,6 +157,7 @@
#'cp3003.esams.wikimedia.org',
'cp3004.esams.wikimedia.org',
'cp3005.esams.wikimedia.org',
+   'cp3006.esams.wikimedia.org',
'cp3009.esams.wikimedia.org',
'cp3010.esams.wikimedia.org',
],

-- 
To view, visit https://gerrit.wikimedia.org/r/57739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I91ec11065bfc4c1a03915849fb1d52cf8f42dc03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] inserted a package structure for jobutils - change (labs/toollabs)

2013-04-05 Thread Petrb (Code Review)

Petrb has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57740


Change subject: inserted a package structure for jobutils
..

inserted a package structure for jobutils

Change-Id: I4c92ba0cede54616caf037a99ca79247b2c189cf
---
A packages/jobutils/DEBIAN/control
A packages/jobutils/share/man/man1/jstart.1
A packages/jobutils/share/man/man1/jstop.1
A packages/jobutils/share/man/man1/jsub.1
A packages/jobutils/usr/local/bin/jstart
A packages/jobutils/usr/local/bin/jstop
A packages/jobutils/usr/local/bin/jsub
7 files changed, 356 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/40/57740/1

diff --git a/packages/jobutils/DEBIAN/control b/packages/jobutils/DEBIAN/control
new file mode 100644
index 000..829ff91
--- /dev/null
+++ b/packages/jobutils/DEBIAN/control
@@ -0,0 +1,11 @@
+Package: Jobutils
+Version: 1.0.0
+Section: universe/utils
+Priority: optional
+Architecture: all
+Essential: no
+Depends: perl gridengine-common
+Installed-Size: 9
+Maintainer: Mark Pelletier , Petr Bena 
+Description: Set of utilities to use on wikimedia bots and tools cluster
+ This package will install jstart (jsub) and jstop, which can be used with GE
diff --git a/packages/jobutils/share/man/man1/jstart.1 
b/packages/jobutils/share/man/man1/jstart.1
new file mode 100644
index 000..cc47739
--- /dev/null
+++ b/packages/jobutils/share/man/man1/jstart.1
@@ -0,0 +1,33 @@
+.\" Man page for jstart
+.\" Licensed under BSD-like License.
+.\" Created by Marc Pelletier
+.\"
+.TH Jobutils "jstart" "User Manual"
+.SH NAME
+usage: jstart [options...] program [arg...]
+
+Options include many (but not all) qsub options, along with:
+ \-stderr   Send errors to stderr rather than the error
+   output file.
+ \-mem   Request  amount of memory for the job.
+   (number prefixed by 'k', 'm' or 'g')
+ \-once Only start one job with that name, fail if
+   another is already started or queued.
+ \-continuous   Start a self-restarting job on the continuous
+   queue (default if invoked as 'jstart')
+
+Unlike qsub, if you do not specify output and error files, output is appended
+by default to files named .err and .out in your home directory
+(without job numbers), including errors from starting the job itself.
+
+Additionally, you need to provide an executable on the command line,
+jstart will not read a script from standard input.
+
+.SH DESCRIPTION
+jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
+.PP
+.SH "AUTHOR"
+Marc Pelletier, Petr Bena
+.br
+
+
diff --git a/packages/jobutils/share/man/man1/jstop.1 
b/packages/jobutils/share/man/man1/jstop.1
new file mode 100644
index 000..0d596cb
--- /dev/null
+++ b/packages/jobutils/share/man/man1/jstop.1
@@ -0,0 +1,18 @@
+.\" Man page for jstart
+.\" Licensed under CC-BY-SA
+.\" Created by Marc Pelletier
+.\"
+.TH Jobutils "jstop" "User Manual"
+.SH NAME
+usage: jstop [jobname]
+
+Delete a job
+
+.SH DESCRIPTION
+jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
+.PP
+.SH "AUTHOR"
+Marc Pelletier, Petr Bena
+.br
+
+
diff --git a/packages/jobutils/share/man/man1/jsub.1 
b/packages/jobutils/share/man/man1/jsub.1
new file mode 100644
index 000..ee56f2d
--- /dev/null
+++ b/packages/jobutils/share/man/man1/jsub.1
@@ -0,0 +1,33 @@
+.\" Man page for jstart
+.\" Licensed under CC-BY-SA
+.\" Created by Marc Pelletier
+.\"
+.TH Jobutils "jsub" "User Manual"
+.SH NAME
+usage: jsub [options...] program [arg...]
+
+Options include many (but not all) qsub options, along with:
+ \-stderr   Send errors to stderr rather than the error
+   output file.
+ \-mem   Request  amount of memory for the job.
+   (number prefixed by 'k', 'm' or 'g')
+ \-once Only start one job with that name, fail if
+   another is already started or queued.
+ \-continuous   Start a self-restarting job on the continuous
+   queue (default if invoked as 'jstart')
+
+Unlike qsub, if you do not specify output and error files, output is appended
+by default to files named .err and .out in your home directory
+(without job numbers), including errors from starting the job itself.
+
+Additionally, you need to provide an executable on the command line,
+jstart will not read a script from standard input.
+
+.SH DESCRIPTION
+jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
+.PP
+.SH "AUTHOR"
+Marc Pelletier, Petr Bena
+.br
+
+
diff --git a/packages/jobutils/usr/local/bin/jstart 
b/packages/jobutils/usr/local/bin/jstart
new file mode 100755
index 000..756ee1d
--- /dev/null
+++ b/packages/jobutils/usr/local/bin/jstart
@@ -0,0 +1,126 @@
+#! /usr/bin/perl
+
+my

[MediaWiki-commits] [Gerrit] fixed php doc in ApiBase - change (mediawiki/core)

2013-04-05 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57741


Change subject: fixed php doc in ApiBase
..

fixed php doc in ApiBase

Change-Id: I9c893de8c067be3e926f5de5f0b87ac47b81772d
---
M includes/api/ApiBase.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/57741/1

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index be913cf..f386a8a 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1165,7 +1165,7 @@
/**
 * Validate and normalize of parameters of type 'user'
 * @param string $value Parameter value
-* @param string $encParamName Parameter value
+* @param string $encParamName Parameter name
 * @return string Validated and normalized parameter
 */
private function validateUser( $value, $encParamName ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/57741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c893de8c067be3e926f5de5f0b87ac47b81772d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Layout adjustments for homepage - change (translatewiki)

2013-04-05 Thread Santhosh (Code Review)

Santhosh has submitted this change and it was merged.

Change subject: Layout adjustments for homepage
..


Layout adjustments for homepage

Layout adjustments for heading, search bar and statistics.

Change-Id: I280bcf1b1cf2f0bf32fbec982be730f2837450f8
---
M MainPage/resources/css/ext.translate.mainpage.css
1 file changed, 28 insertions(+), 19 deletions(-)

Approvals:
  Santhosh: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/MainPage/resources/css/ext.translate.mainpage.css 
b/MainPage/resources/css/ext.translate.mainpage.css
index 15945a5..5b8dd04 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -10,6 +10,16 @@
margin-right: 5%;
 }
 
+.twn-mainpage-header {
+   /* @embed */
+   background: transparent url('//translatewiki.net/static/logo.png') 
no-repeat scroll left center;
+   /*FIXME: we need svgs too*/
+   background-size: 50px;
+   padding-left: 55px;
+   padding-bottom: 5px;
+   height: 75px;
+}
+
 .twn-mainpage-header .uls-trigger {
background-position: bottom left;
padding-left: 30px;
@@ -17,23 +27,15 @@
padding-top: 50px;
 }
 
-.twn-mainpage-title { /* @embed */
-   background: transparent url('//translatewiki.net/static/logo.png') 
no-repeat scroll left center;
-   /*FIXME: we need svgs too*/
-   background-size: 50px;
-   height: 75px;
-}
-
 .twn-mainpage-title .twn-brand-name {
-   padding-left: 50px;
-   padding-top: 20px;
+   padding-top: 18px;
font-size: 24px;
 }
 
 .twn-mainpage-title .twn-brand-motto {
-   padding-left: 50px;
padding-top: 5px;
font-size: 16px;
+   color: #55;
 }
 
 .twn-mainpage-header {
@@ -96,7 +98,6 @@
max-height: 580px;
opacity: 0.95;
margin: 10px;
-   padding: 10px;
 }
 
 .user-stats-title {
@@ -119,7 +120,7 @@
 }
 
 .main-widget > .row {
-   padding: 10px 5px;
+   padding: 10px;
 }
 
 .ranking {
@@ -134,7 +135,7 @@
 }
 
 .ranking .button {
-   width: 80%;
+   min-width: 80%;
min-height: 30px;
 }
 
@@ -153,7 +154,7 @@
 }
 
 a.langstats-link {
-   font-size: 16pt;
+   font-size: 14pt;
padding: 10px;
 }
 
@@ -299,16 +300,24 @@
 }
 
 .twn-mainpage-search {
+   height: 50px;
+   padding: 10px 10px 10px 60px;
+   position:relative;
+}
+
+.twn-mainpage-search:before {
+   display: inline-block;
+   content: "";
/* @embed */
-   background: #000 url('../images/search.png') no-repeat scroll left 
center;
+   background: #252525 url('../images/search.png') no-repeat scroll left 
center;
background-image: -webkit-linear-gradient(transparent, transparent), 
url('../images/search.svg');
background-image: -moz-linear-gradient(transparent, transparent), 
url('../images/search.svg');
background-image: linear-gradient(transparent, transparent), 
url('../images/search.svg');
background-size: 30px;
-   height: 50px;
-   padding: 10px 10px 10px 40px;
-   float: left;
-   margin-left: -15px;
+   height: 30px;
+   width: 30px;
+   position: absolute;
+   left: 25px;
 }
 
 .twn-mainpage-project-selector-title {

-- 
To view, visit https://gerrit.wikimedia.org/r/57510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I280bcf1b1cf2f0bf32fbec982be730f2837450f8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Pginer 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mark > marc + comma - change (labs/toollabs)

2013-04-05 Thread Petrb (Code Review)

Petrb has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57742


Change subject: mark > marc + comma
..

mark > marc + comma

Change-Id: I7310e23c2335c1f82063ab40ecf3283da7c0e4cc
---
M packages/jobutils/DEBIAN/control
M packages/jobutils/share/man/man1/jstart.1
M packages/jobutils/share/man/man1/jstop.1
M packages/jobutils/share/man/man1/jsub.1
4 files changed, 8 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/42/57742/1

diff --git a/packages/jobutils/DEBIAN/control b/packages/jobutils/DEBIAN/control
index 829ff91..c2ac5e9 100644
--- a/packages/jobutils/DEBIAN/control
+++ b/packages/jobutils/DEBIAN/control
@@ -4,8 +4,8 @@
 Priority: optional
 Architecture: all
 Essential: no
-Depends: perl gridengine-common
+Depends: perl, gridengine-common
 Installed-Size: 9
-Maintainer: Mark Pelletier , Petr Bena 
+Maintainer: Marc-André Pelletier , Petr Bena 

 Description: Set of utilities to use on wikimedia bots and tools cluster
  This package will install jstart (jsub) and jstop, which can be used with GE
diff --git a/packages/jobutils/share/man/man1/jstart.1 
b/packages/jobutils/share/man/man1/jstart.1
index cc47739..33cd924 100644
--- a/packages/jobutils/share/man/man1/jstart.1
+++ b/packages/jobutils/share/man/man1/jstart.1
@@ -1,6 +1,6 @@
 .\" Man page for jstart
 .\" Licensed under BSD-like License.
-.\" Created by Marc Pelletier
+.\" Created by Marc-André Pelletier
 .\"
 .TH Jobutils "jstart" "User Manual"
 .SH NAME
@@ -27,7 +27,5 @@
 jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
 .PP
 .SH "AUTHOR"
-Marc Pelletier, Petr Bena
+Marc-André Pelletier, Petr Bena
 .br
-
-
diff --git a/packages/jobutils/share/man/man1/jstop.1 
b/packages/jobutils/share/man/man1/jstop.1
index 0d596cb..50bea5e 100644
--- a/packages/jobutils/share/man/man1/jstop.1
+++ b/packages/jobutils/share/man/man1/jstop.1
@@ -1,6 +1,6 @@
 .\" Man page for jstart
 .\" Licensed under CC-BY-SA
-.\" Created by Marc Pelletier
+.\" Created by Marc-André Pelletier
 .\"
 .TH Jobutils "jstop" "User Manual"
 .SH NAME
@@ -12,7 +12,5 @@
 jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
 .PP
 .SH "AUTHOR"
-Marc Pelletier, Petr Bena
+Marc-André Pelletier, Petr Bena
 .br
-
-
diff --git a/packages/jobutils/share/man/man1/jsub.1 
b/packages/jobutils/share/man/man1/jsub.1
index ee56f2d..a3ae4d9 100644
--- a/packages/jobutils/share/man/man1/jsub.1
+++ b/packages/jobutils/share/man/man1/jsub.1
@@ -1,6 +1,6 @@
 .\" Man page for jstart
 .\" Licensed under CC-BY-SA
-.\" Created by Marc Pelletier
+.\" Created by Marc-André Pelletier
 .\"
 .TH Jobutils "jsub" "User Manual"
 .SH NAME
@@ -27,7 +27,5 @@
 jobutils will insert extra commands to grid engine, these tools were created 
for wikimedia tools project
 .PP
 .SH "AUTHOR"
-Marc Pelletier, Petr Bena
+Marc-André Pelletier, Petr Bena
 .br
-
-

-- 
To view, visit https://gerrit.wikimedia.org/r/57742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7310e23c2335c1f82063ab40ecf3283da7c0e4cc
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Petrb 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ok, and these manual pages of course should be in usr as well - change (labs/toollabs)

2013-04-05 Thread Petrb (Code Review)

Petrb has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57743


Change subject: ok, and these manual pages of course should be in usr as well
..

ok, and these manual pages of course should be in usr as well

Change-Id: Iedae79846cca35f1da339c2a186d275d709515bd
---
R packages/jobutils/usr/share/man/man1/jstart.1
R packages/jobutils/usr/share/man/man1/jstop.1
R packages/jobutils/usr/share/man/man1/jsub.1
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/43/57743/1

diff --git a/packages/jobutils/share/man/man1/jstart.1 
b/packages/jobutils/usr/share/man/man1/jstart.1
similarity index 100%
rename from packages/jobutils/share/man/man1/jstart.1
rename to packages/jobutils/usr/share/man/man1/jstart.1
diff --git a/packages/jobutils/share/man/man1/jstop.1 
b/packages/jobutils/usr/share/man/man1/jstop.1
similarity index 100%
rename from packages/jobutils/share/man/man1/jstop.1
rename to packages/jobutils/usr/share/man/man1/jstop.1
diff --git a/packages/jobutils/share/man/man1/jsub.1 
b/packages/jobutils/usr/share/man/man1/jsub.1
similarity index 100%
rename from packages/jobutils/share/man/man1/jsub.1
rename to packages/jobutils/usr/share/man/man1/jsub.1

-- 
To view, visit https://gerrit.wikimedia.org/r/57743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedae79846cca35f1da339c2a186d275d709515bd
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Petrb 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow dysprosium to be installed - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57744


Change subject: Allow dysprosium to be installed
..

Allow dysprosium to be installed

Change-Id: If028762ebc5d031836cb352c8287440db237428b
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/57744/1

diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 5762f9a..d1a17e3 100644
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -37,7 +37,7 @@
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo 
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
-   cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70) 
echo partman/raid1-varnish.cfg ;; \
+   
cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo 
partman/raid1-varnish.cfg ;; \

barium|caesium|celsus|cerium|colby|constable|europium|gadolinium|kuo|lardner|mexia|neodymium|palladium|promethium|strontium|terbium|titanium|tola|xenon|wtp100[1-4])
 echo partman/lvm.cfg ;; \
lvs*) echo partman/lvs.cfg ;; \
ekrem|lanthanum) echo partman/raid1.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 861144e..ca349ec 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1021,6 +1021,11 @@
fixed-address db1060.eqiad.wmnet;
 }
 
+host dysprosium {
+   hardware ethernet 90:B1:1C:3B:C7:2C;
+   fixed-address dysprosium.eqiad.wmnet;
+}
+
 host ekrem {
hardware ethernet 84:2b:2b:06:49:30;
fixed-address ekrem.wikimedia.org;

-- 
To view, visit https://gerrit.wikimedia.org/r/57744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If028762ebc5d031836cb352c8287440db237428b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow dysprosium to be installed - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Allow dysprosium to be installed
..


Allow dysprosium to be installed

Change-Id: If028762ebc5d031836cb352c8287440db237428b
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Mark Bergsma: Verified; Looks good to me, approved



diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 5762f9a..d1a17e3 100644
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -37,7 +37,7 @@
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo 
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
-   cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70) 
echo partman/raid1-varnish.cfg ;; \
+   
cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo 
partman/raid1-varnish.cfg ;; \

barium|caesium|celsus|cerium|colby|constable|europium|gadolinium|kuo|lardner|mexia|neodymium|palladium|promethium|strontium|terbium|titanium|tola|xenon|wtp100[1-4])
 echo partman/lvm.cfg ;; \
lvs*) echo partman/lvs.cfg ;; \
ekrem|lanthanum) echo partman/raid1.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 861144e..ca349ec 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1021,6 +1021,11 @@
fixed-address db1060.eqiad.wmnet;
 }
 
+host dysprosium {
+   hardware ethernet 90:B1:1C:3B:C7:2C;
+   fixed-address dysprosium.eqiad.wmnet;
+}
+
 host ekrem {
hardware ethernet 84:2b:2b:06:49:30;
fixed-address ekrem.wikimedia.org;

-- 
To view, visit https://gerrit.wikimedia.org/r/57744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If028762ebc5d031836cb352c8287440db237428b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Call ApiPageSet::getFinalParamDescription - change (mediawiki/core)

2013-04-05 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57745


Change subject: Call ApiPageSet::getFinalParamDescription
..

Call ApiPageSet::getFinalParamDescription

This allows extensions to modify the param description of the ApiPageSet
params at once for each module, which used the ApiPageSet.

Change-Id: I2ed6f3ad38d3d84182b8525a6b247f721be7f460
---
M includes/api/ApiImageRotate.php
M includes/api/ApiPurge.php
M includes/api/ApiQuery.php
M includes/api/ApiSetNotificationTimestamp.php
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/57745/1

diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index db82805..e4642dd 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -196,7 +196,7 @@
 
public function getParamDescription() {
$pageSet = $this->getPageSet();
-   return $pageSet->getParamDescription() + array(
+   return $pageSet->getFinalParamDescription() + array(
'rotation' => 'Degrees to rotate image clockwise',
'token' => 'Edit token. You can get one of these 
through action=tokens',
);
diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 134f4a0..49cc738 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -158,7 +158,7 @@
}
 
public function getParamDescription() {
-   return $this->getPageSet()->getParamDescription()
+   return $this->getPageSet()->getFinalParamDescription()
+ array( 'forcelinkupdate' => 'Update the links tables' 
);
}
 
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 02c1b27..4d9a772 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -696,7 +696,7 @@
}
 
public function getParamDescription() {
-   return $this->getPageSet()->getParamDescription() + array(
+   return $this->getPageSet()->getFinalParamDescription() + array(
'prop' => 'Which properties to get for the 
titles/revisions/pageids. Module help is available below',
'list' => 'Which lists to get. Module help is available 
below',
'meta' => 'Which metadata to get about the site. Module 
help is available below',
diff --git a/includes/api/ApiSetNotificationTimestamp.php 
b/includes/api/ApiSetNotificationTimestamp.php
index 58d5d9a..cae9673 100644
--- a/includes/api/ApiSetNotificationTimestamp.php
+++ b/includes/api/ApiSetNotificationTimestamp.php
@@ -212,7 +212,7 @@
}
 
public function getParamDescription() {
-   return $this->getPageSet()->getParamDescription() + array(
+   return $this->getPageSet()->getFinalParamDescription() + array(
'entirewatchlist' => 'Work on all watched pages',
'timestamp' => 'Timestamp to which to set the 
notification timestamp',
'torevid' => 'Revision to set the notification 
timestamp to (one page only)',

-- 
To view, visit https://gerrit.wikimedia.org/r/57745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ed6f3ad38d3d84182b8525a6b247f721be7f460
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 46927) Fix resource path fatal error - change (mediawiki...UniversalLanguageSelector)

2013-04-05 Thread Aude (Code Review)

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57746


Change subject: (bug 46927) Fix resource path fatal error
..

(bug 46927) Fix resource path fatal error

Change-Id: I8073c844682b1d8816704e1dc0e39bc197e08833
---
M Resources.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/46/57746/1

diff --git a/Resources.php b/Resources.php
index 8b5feec..95e0a86 100644
--- a/Resources.php
+++ b/Resources.php
@@ -9,7 +9,7 @@
 $resourcePaths = array(
'localBasePath' => __DIR__,
'remoteExtPath' => 'UniversalLanguageSelector'
-) + $resourcePaths;
+);
 
 $wgResourceModules['ext.uls.displaysettings'] = array(
'scripts' => 'resources/js/ext.uls.displaysettings.js',

-- 
To view, visit https://gerrit.wikimedia.org/r/57746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8073c844682b1d8816704e1dc0e39bc197e08833
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Aude 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] inserted a package structure for jobutils - change (labs/toollabs)

2013-04-05 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: inserted a package structure for jobutils
..


inserted a package structure for jobutils

Change-Id: I4c92ba0cede54616caf037a99ca79247b2c189cf
---
A packages/jobutils/DEBIAN/control
A packages/jobutils/usr/local/bin/jstart
A packages/jobutils/usr/local/bin/jstop
A packages/jobutils/usr/local/bin/jsub
A packages/jobutils/usr/share/man/man1/jstart.1
A packages/jobutils/usr/share/man/man1/jstop.1
A packages/jobutils/usr/share/man/man1/jsub.1
7 files changed, 350 insertions(+), 0 deletions(-)

Approvals:
  coren: Verified; Looks good to me, approved



diff --git a/packages/jobutils/DEBIAN/control b/packages/jobutils/DEBIAN/control
new file mode 100644
index 000..c2ac5e9
--- /dev/null
+++ b/packages/jobutils/DEBIAN/control
@@ -0,0 +1,11 @@
+Package: Jobutils
+Version: 1.0.0
+Section: universe/utils
+Priority: optional
+Architecture: all
+Essential: no
+Depends: perl, gridengine-common
+Installed-Size: 9
+Maintainer: Marc-André Pelletier , Petr Bena 

+Description: Set of utilities to use on wikimedia bots and tools cluster
+ This package will install jstart (jsub) and jstop, which can be used with GE
diff --git a/packages/jobutils/usr/local/bin/jstart 
b/packages/jobutils/usr/local/bin/jstart
new file mode 100755
index 000..756ee1d
--- /dev/null
+++ b/packages/jobutils/usr/local/bin/jstart
@@ -0,0 +1,126 @@
+#! /usr/bin/perl
+
+my %qsubargs = (
+   '-a' => 1, '-b' => 1, '-cwd' => 0, '-e' => 1, '-hard' => 0, '-i' => 1, 
'-j' => 1,
+   '-l' => 1, '-now' => 1, '-N' => 1, '-o' => 1, '-p' => 1, '-q' => 1, 
'-soft' => 0,
+   '-sync' => 1, '-v' => 1, '-wd' => 1,
+);
+my %qsargs;
+my @args;
+my $memory = '256m';
+my $once = 0;
+my $stderr = 0;
+my $continuous = 0;
+my $script = $0;
+my $queue = 'task';
+$script = $1 if $script =~ m{/([^/]+)$};
+
+$continuous = 1 if $script eq 'jstart';
+
+while($#ARGV > 0) {
+  if(defined $qsubargs{$ARGV[0]}) {
+$arg = shift;
+$qsargs{$arg} = $qsubargs{$arg}? $ARGV[0]: '';
+if($arg eq '-N' or $arg eq '-q') {
+  shift if $qsubargs{$arg};
+  next;
+}
+push @args, $arg;
+push @args, shift if $qsubargs{$arg};
+  } elsif ($ARGV[0] eq '-mem') {
+shift;
+$memory = shift;
+die "$script: memory value must be an integer followed by 'k', 'm' or 
'g'\n" unless $memory =~ m/^([1-9][0-9]*[mMgGkK])$/;
+  } elsif ($ARGV[0] eq '-once') {
+$once = 1;
+shift;
+  } elsif ($ARGV[0] eq '-stderr') {
+$stderr = 1;
+shift;
+  } elsif ($ARGV[0] eq '-continuous') {
+$continuous = 1;
+$once = 1;
+shift;
+  } else {
+last;
+  }
+}
+
+if($#ARGV<0 or $ARGV[0] =~ m/^-/) {
+  print STDERR <<"END"
+
+usage: $script [options...] program [arg...]
+
+Options include many (but not all) qsub options, along with:
+ -stderr   Send errors to stderr rather than the error
+   output file.
+ -mem   Request  amount of memory for the job.
+   (number prefixed by 'k', 'm' or 'g')
+ -once Only start one job with that name, fail if
+   another is already started or queued.
+ -continuous   Start a self-restarting job on the continuous
+   queue (default if invoked as 'jstart')
+
+Unlike qsub, if you do not specify output and error files, output is appended
+by default to files named .err and .out in your home directory
+(without job numbers), including errors from starting the job itself.
+
+Additionally, you need to provide an executable on the command line,
+$script will not read a script from standard input.
+
+END
+  ;
+  exit 1;
+}
+
+my $exe = shift;
+my $prog = `/usr/bin/which $exe`;
+chomp $prog;
+$prog = readlink $prog while -l $prog;
+my $cwd = `pwd`;
+chomp $cwd;
+$prog = "$cwd/$exe" unless -f $prog and -x $prog;
+
+my $jobname = 'unknown';
+$jobname = $1 if $prog =~ m{([^/.]+)(\.[^/]*)?$};
+$jobname = $qsargs{'-N'} if defined $qsargs{'-N'};
+
+my $err = "$ENV{'HOME'}/$jobname.err";
+my $out = "$ENV{'HOME'}/$jobname.out";
+
+$err = $qsargs{'-e'} if defined $qsargs{'-e'};
+$out = $qsargs{'-o'} if defined $qsargs{'-o'};
+$err = $out if defined $qsargs{'-j'} and $qsargs{'-j'} =~ m/^[yY]/;
+
+open STDERR, ">>$err" unless $stderr;
+
+my $now = localtime;
+
+die "\[$now\] $prog: not an executable file\n" unless -f $prog and -x $prog;
+
+if($once) {
+  my $running = system "/usr/local/bin/job", '-q', $jobname;
+  die "\[$now\] unable to get job status\n" if $running & 127;
+  $running >>= 8;
+  die "\[$now\] there is a job named '$jobname' already active\n" unless 
$running==0;
+}
+
+push @args, '-e', $err unless defined $qsargs{'-e'};
+push @args, '-o', $out unless defined $qsargs{'-o'};
+push @args, '-N', $jobname, '-hard', '-l', "h_vmem=$memory";
+
+if($continuous) {
+  push @args, '-q', 'continuous';
+  open QSUB, "|/usr/bin/qsub '".join("' '", @args)."'" or die "\[$now\] unable 
to start qsub: $!\n";
+  prin

[MediaWiki-commits] [Gerrit] forgot to remove unnecessary commented lines - change (qa/browsertests)

2013-04-05 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57747


Change subject: forgot to remove unnecessary commented lines
..

forgot to remove unnecessary commented lines

Change-Id: I9f7b8956817bf4fbc6bb10becccd30ba95107eec
---
M features/page.feature
M features/step_definitions/page_steps.rb
2 files changed, 15 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/47/57747/1

diff --git a/features/page.feature b/features/page.feature
index d91a63a..6ec2a0c 100644
--- a/features/page.feature
+++ b/features/page.feature
@@ -41,6 +41,7 @@
   And I should see a Leave a redirect radio button
   And I should see a Watch source page radio button
 
+  @login
   Scenario: Move existing page
 Given I am logged in
 And I am starting a page to be moved to a new name
@@ -50,9 +51,5 @@
 Then I should be on a page that says Move succeeded
   And I should see the text A redirect has been created
   And I should have a link to the old page title and a link to the new 
page title
-
-  Scenario: Moved page checks
-Given I moved a page successfully
-When I open the new page URL
-  Then the page displays the new title
-  And the old page displays a redirect to the new page
+  And the the new page should have the correct text
+  And the old page should display a redirect to the new page
diff --git a/features/step_definitions/page_steps.rb 
b/features/step_definitions/page_steps.rb
index 8530f47..10f0a85 100644
--- a/features/step_definitions/page_steps.rb
+++ b/features/step_definitions/page_steps.rb
@@ -109,4 +109,16 @@
   @browser.text.should match /A redirect has been created/
 end
 
+Then(/^the the new page should have the correct text$/) do
+  
on(MovePage).old_page_link_element(@does_not_exist_page_name).when_present.click
+  @browser.text.should match /Redirect page/
+end
+
+Then(/^the old page should display a redirect to the new page$/) do
+  
on(MovePage).moved_page_link_element(@does_not_exist_page_name).when_present.click
+  @browser.text.should match /Moved/
+  @browser.text.should_not match /Redirect page/
+end
+
+
 

-- 
To view, visit https://gerrit.wikimedia.org/r/57747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f7b8956817bf4fbc6bb10becccd30ba95107eec
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] New parserTest: check interaction of italics and English pos... - change (mediawiki/core)

2013-04-05 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57748


Change subject: New parserTest: check interaction of italics and English 
possessives.
..

New parserTest: check interaction of italics and English possessives.

This documents a current bug in the Parsoid parser.

Change-Id: I242324237640dd21fb24c50fa164a45091e388b8
---
M tests/parser/parserTests.txt
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/57748/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e2dcde8..f17bd81 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -363,6 +363,16 @@
 
 !! end
 
+# this example taken from the simple/Moon article
+!! test
+Italics and possessives
+!! input
+obtained by ''[[Lunar Prospector]]'''s gamma-ray spectrometer
+!! result
+obtained by Lunar 
Prospector's gamma-ray spectrometer
+
+!! end
+
 ###
 ### 2-quote opening sequence tests
 ###

-- 
To view, visit https://gerrit.wikimedia.org/r/57748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I242324237640dd21fb24c50fa164a45091e388b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add configuration for dysprosium (varnish performance test box) - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57749


Change subject: Add configuration for dysprosium (varnish performance test box)
..

Add configuration for dysprosium (varnish performance test box)

Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/57749/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5f5b31e..99e9f45 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -419,7 +419,11 @@
 
#class { "varnish::packages": version => 
"3.0.3plus~rc1-wm5" }
 
-   varnish::setup_filesystem{ ["sda3", "sdb3"]:
+   varnish::setup_filesystem{
+   $::hostname ? {
+   'dysprosium' => ["sdc1", "sdd1"],
+   default => ["sda3", "sdb3"]
+   }:
before => Varnish::Instance["upload-backend"]
}
 
@@ -438,6 +442,7 @@
default => [],
},
storage => $::hostname ? {
+   'dysprosium' => "-s 
main-sdc1=persistent,/srv/sdc1/varnish.persist,300G -s 
main-sdd1=file,/srv/sdd1/varnish.persist,300G -s 
bigobj-sdc1=file,/srv/sdc1/large-objects.persist,50G -s 
bigobj-sdd1=file,/srv/sdd1/large-objects.persist,50G",
/^cp30[0-9][0-9]$/ => "-s 
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s 
main-sdb3=file,/srv/sdb3/varnish.persist,${storage_size_main}G -s 
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s 
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
default => "-s 
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s 
main-sdb3=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G -s 
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s 
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
},
diff --git a/manifests/site.pp b/manifests/site.pp
index 66f1f9a..e29d07a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -707,6 +707,10 @@
}
 }
 
+node "dysprosium.eqiad.wmnet" {
+   include role::cache::upload
+}
+
 node "ekrem.wikimedia.org" {
include standard,
misc::irc-server,

-- 
To view, visit https://gerrit.wikimedia.org/r/57749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add configuration for dysprosium (varnish performance test box) - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Add configuration for dysprosium (varnish performance test box)
..


Add configuration for dysprosium (varnish performance test box)

Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Mark Bergsma: Verified; Looks good to me, approved



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5f5b31e..99e9f45 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -419,7 +419,11 @@
 
#class { "varnish::packages": version => 
"3.0.3plus~rc1-wm5" }
 
-   varnish::setup_filesystem{ ["sda3", "sdb3"]:
+   varnish::setup_filesystem{
+   $::hostname ? {
+   'dysprosium' => ["sdc1", "sdd1"],
+   default => ["sda3", "sdb3"]
+   }:
before => Varnish::Instance["upload-backend"]
}
 
@@ -438,6 +442,7 @@
default => [],
},
storage => $::hostname ? {
+   'dysprosium' => "-s 
main-sdc1=persistent,/srv/sdc1/varnish.persist,300G -s 
main-sdd1=file,/srv/sdd1/varnish.persist,300G -s 
bigobj-sdc1=file,/srv/sdc1/large-objects.persist,50G -s 
bigobj-sdd1=file,/srv/sdd1/large-objects.persist,50G",
/^cp30[0-9][0-9]$/ => "-s 
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s 
main-sdb3=file,/srv/sdb3/varnish.persist,${storage_size_main}G -s 
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s 
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
default => "-s 
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s 
main-sdb3=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G -s 
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s 
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
},
diff --git a/manifests/site.pp b/manifests/site.pp
index 66f1f9a..e29d07a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -707,6 +707,10 @@
}
 }
 
+node "dysprosium.eqiad.wmnet" {
+   include role::cache::upload
+}
+
 node "ekrem.wikimedia.org" {
include standard,
misc::irc-server,

-- 
To view, visit https://gerrit.wikimedia.org/r/57749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implement basic template system through PHP. - change (integration/docroot)

2013-04-05 Thread Krinkle (Code Review)

Krinkle has submitted this change and it was merged.

Change subject: Implement basic template system through PHP.
..


Implement basic template system through PHP.

Change-Id: Ib70a3881a9d04e91cbd0c289fd627218242226ae
---
D org/wikimedia/doc/index.html
A org/wikimedia/doc/index.php
D org/wikimedia/integration/index.html
A org/wikimedia/integration/index.php
D org/wikimedia/integration/zuul/index.html
A org/wikimedia/integration/zuul/index.php
A shared/IntegrationPage.php
7 files changed, 355 insertions(+), 242 deletions(-)

Approvals:
  Krinkle: Verified; Looks good to me, approved



diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html
deleted file mode 100644
index 73cd9c8..000
--- a/org/wikimedia/doc/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-   
-   Documentation - Wikimedia
-   
-   
-   
-   
-
-
-
-   
-   
-   Documentation
-   
-   
-   MediaWiki core (PHP • JS)
-   VisualEditor
-   Puppet (source)
-   
-   
-
-
-
diff --git a/org/wikimedia/doc/index.php b/org/wikimedia/doc/index.php
new file mode 100644
index 000..ed11999
--- /dev/null
+++ b/org/wikimedia/doc/index.php
@@ -0,0 +1,14 @@
+addHtmlContent('
+
+   MediaWiki core (PHP • JS)
+   VisualEditor
+   Puppet (source)
+
+');
+
+$p->flush();
diff --git a/org/wikimedia/integration/index.html 
b/org/wikimedia/integration/index.html
deleted file mode 100644
index bcb5c12..000
--- a/org/wikimedia/integration/index.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-   
-   Continuous integration - Wikimedia
-   
-   
-   
-   
-   
-   .footer {
-   background-color: #f5f5f5;
-   }
-
-   .footer p {
-   margin: 20px 0;
-   }
-
-   @media (max-width: 767px) {
-   .footer {
-   margin-left: -20px;
-   margin-right: -20px;
-   padding-left: 20px;
-   padding-right: 20px;
-   }
-   }
-
-   /**
-* Sticky footer
-*/
-
-   html,
-   body {
-   height: 100%;
-   }
-
-   .page-wrap {
-   min-height: 100%;
-   height: auto !important;
-   height: 100%;
-   /* Bump footer up by its height */
-   margin: 0 auto -80px auto;
-   }
-
-   /* Fixed height of footer */
-   .push,
-   .footer {
-   height: 80px;
-   }
-   
-
-
-
-   
-   
-   
-   
-   
-   Welcome!
-   
-   This is the continous 
integration server for Wikimedia 
Foundation projects.
-   Applications
-   
-   https://gerrit.wikimedia.org/r/";>Gerrit (code review)
-   Jenkins
-   TestSwarm 
(QUnit/Javascript), disabled
-   Zuul status 
(Gerrit/Jenkins gateway)
-   
-
-   Nightly builds
-   
-   MediaWiki 
core (latest)
-   Commons Android application
-   (github: https://github.com/wikimedia/android-commons";>android-commons)
-   
-   
-   Wikipedia 
Android application
-   (github: https://github.com/wikimedia/WikipediaMobile";>WikipediaMobile)
-   
-   
-   Wiktionary 
Android application
-   (github: https://github.com/wikimedia/WiktionaryMobile";>WiktionaryMobile)
-   
-   
-   Wikimedia Loves 
Monument Android application
-   (github: https://github.com/wikimedia/WLMMobile";>WLMMobile)
-   
-   
-   
-   
-
-
-   
-   
-   Questions? Comments? Concerns?
-   Contact ^demon, Krinkle or 
hashar on #wikimedia-dev.
-   
-   
-
-
-
-
-
diff --git a/org/wikimedia/integration/index.php 
b/org/wikimedia/integration/index.php
new file mode 100644
index 000..1146cba
--- /dev/null
+++ b/org/wikimedia/integration/index.php
@@ -0,0 +1,38 @@
+enableFooter();
+
+$p->addHtmlContent('
+This is the continous 
integration server for Wikimedia 
Foundation projects.
+Applications
+
+   https://gerrit.wikimedia.org/r/";>Gerrit (code 
review)
+   Jenkins
+   TestSwarm (QUnit/Javascript), 
disabled
+   Zuul status (Gerrit/Jenkins 
gateway)
+
+
+Nightly builds
+
+   MediaWiki core (latest)
+   Commons Android 
application
+   (github: http

[MediaWiki-commits] [Gerrit] Changed English message to match the qqq description - change (mediawiki...Wikibase)

2013-04-05 Thread Aude (Code Review)

Aude has submitted this change and it was merged.

Change subject: Changed English message to match the qqq description
..


Changed English message to match the qqq description

Bug: 46784

+ made another related message more understandable

Change-Id: I00aad8f6ef8ca72bbdab88e48b8561add881fcff
---
M client/WikibaseClient.i18n.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Aude: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php
index a71cbd1..0a5e4cc 100644
--- a/client/WikibaseClient.i18n.php
+++ b/client/WikibaseClient.i18n.php
@@ -59,7 +59,7 @@
'wikibase-error-invalid-entity-id' => 'The ID entered is unknown to the 
system. Please use a valid entity ID.',
'special-unconnectedpages' => 'Pages not connected to items',
'wikibase-unconnectedpages-legend' => 'Unconnected pages options',
-   'wikibase-unconnectedpages-page' => 'Start page:',
+   'wikibase-unconnectedpages-page' => 'Start result list with article:',
'wikibase-unconnectedpages-submit' => 'Go',
'wikibase-unconnectedpages-invalid-language' => '"$1" is not a valid 
language code.',
'wikibase-unconnectedpages-page-warning' => 'The page title could not 
be used for the query and is ignored.',
@@ -155,12 +155,12 @@
'wikibase-error-invalid-entity-id' => 'Generic error message when an 
invalid entity ID was entered.',
'special-unconnectedpages' => '{{doc-special|UnconnectedPages}}',
'wikibase-unconnectedpages-legend' => 'Legend for the options box at 
the special page for pages not connected to sitelinks.',
-   'wikibase-unconnectedpages-page' => 'Label for the start page field in 
the options box of the special page for pages not connected to sitelinks.',
+   'wikibase-unconnectedpages-page' => 'Label for the input field to 
specify the title of the article at which the search result list should start. 
This belongs to the options box of the special page for pages not connected to 
sitelinks.',
'wikibase-unconnectedpages-submit' => 'Text for the submit button in 
the options box of the special page for pages not connected to sitelinks.
 {{Identical|Go}}',
'wikibase-unconnectedpages-invalid-language' => 'Warning message about 
invalid language used at the special page for pages not connected to 
sitelinks.',
'wikibase-unconnectedpages-page-warning' => 'The title that is typed in 
could not be used of some kind of reason. This can happen for example when the 
title has an interwiki prefix to another language, or a namespace that is not 
used for Wikibase entities.',
-   'wikibase-unconnectedpages-iwdata-label' => 'Text for the checkbox. 
Should say that only pages without interlanguage-links should be listed.',
+   'wikibase-unconnectedpages-iwdata-label' => 'Text for the checkbox. 
Should say that only pages that have interlanguage-links should be listed.',
'wikibase-unconnectedpages-format-row' => 'Formatting of the additional 
data for each row in the result set on the special page for pages not connected 
to sitelinks.
 
 This message follows the page title (with link).

-- 
To view, visit https://gerrit.wikimedia.org/r/57046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I00aad8f6ef8ca72bbdab88e48b8561add881fcff
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Michał Łazowik 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Denny Vrandecic 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adding basic 'file' feature, step defn, & class file - change (qa/browsertests)

2013-04-05 Thread Sumanah (Code Review)

Sumanah has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57750


Change subject: Adding basic 'file' feature, step defn, & class file
..

Adding basic 'file' feature, step defn, & class file

To improve the automated search testing, we'll need to
be able to check whether a particular file exists on the
target install.  Here's some bare-bones code to test MediaWiki's
behavior for when a file doesn't exist, both anon & logged-in.

Change-Id: I773483a0793b96b931e084ad74991a3a812db5b7
---
A features/file.feature
A features/step_definitions/file_steps.rb
A features/support/pages/file_does_not_exist_page.rb
3 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/50/57750/1

diff --git a/features/file.feature b/features/file.feature
new file mode 100644
index 000..b64730e
--- /dev/null
+++ b/features/file.feature
@@ -0,0 +1,11 @@
+Feature: File
+
+ Scenario: Anonymous goes to file that does not exist
+   Given I am at file that does not exist
+   Then page text should contain No file by this name exists.
+
+ @login
+ Scenario: Logged-in user goes to file that does not exist
+   Given I am logged in
+ And I am at file that does not exist
+   Then page text should contain No file by this name exists, but you can 
upload it.
diff --git a/features/step_definitions/file_steps.rb 
b/features/step_definitions/file_steps.rb
new file mode 100644
index 000..6702898
--- /dev/null
+++ b/features/step_definitions/file_steps.rb
@@ -0,0 +1,4 @@
+Given(/^I am at file that does not exist$/) do
+  visit FileDoesNotExistPage
+end
+
diff --git a/features/support/pages/file_does_not_exist_page.rb 
b/features/support/pages/file_does_not_exist_page.rb
new file mode 100644
index 000..4fdbdc9
--- /dev/null
+++ b/features/support/pages/file_does_not_exist_page.rb
@@ -0,0 +1,6 @@
+class FileDoesNotExistPage
+  include PageObject
+
+  page_url 'https://test2.wikipedia.org/wiki/File:Bleg.oggx'
+
+end

-- 
To view, visit https://gerrit.wikimedia.org/r/57750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I773483a0793b96b931e084ad74991a3a812db5b7
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Sumanah 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add IPv6 address to dysprosium - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57751


Change subject: Add IPv6 address to dysprosium
..

Add IPv6 address to dysprosium

Change-Id: I320d9eacb4f948a65af29ae326fc6c17749a3b35
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/57751/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e29d07a..d7dba22 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -708,6 +708,8 @@
 }
 
 node "dysprosium.eqiad.wmnet" {
+   interface_add_ip6_mapped { "main": interface => "eth0" }
+
include role::cache::upload
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/57751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I320d9eacb4f948a65af29ae326fc6c17749a3b35
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add IPv6 address to dysprosium - change (operations/puppet)

2013-04-05 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Add IPv6 address to dysprosium
..


Add IPv6 address to dysprosium

Change-Id: I320d9eacb4f948a65af29ae326fc6c17749a3b35
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Mark Bergsma: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index e29d07a..d7dba22 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -708,6 +708,8 @@
 }
 
 node "dysprosium.eqiad.wmnet" {
+   interface_add_ip6_mapped { "main": interface => "eth0" }
+
include role::cache::upload
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/57751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I320d9eacb4f948a65af29ae326fc6c17749a3b35
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: Mark Bergsma 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move bold/italic parser tests from Parsoid's whitelist into ... - change (mediawiki/core)

2013-04-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: Move bold/italic parser tests from Parsoid's whitelist into 
upstream.
..


Move bold/italic parser tests from Parsoid's whitelist into upstream.

Parsoid has been maintaining a whitelist for tests where its output
diverges from the PHP parser.  This patch upstreams part of that whitelist,
creating separate PHP and Parsoid test cases to document in one place
where the parsed output diverges and why.  (Uses the recently-added
'php' and 'parsoid' options in parserTests.)

Change-Id: I07ca6ec1e039a2842c641fe543b2d92eb964d932
---
M tests/parser/parserTests.txt
1 file changed, 161 insertions(+), 9 deletions(-)

Approvals:
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 0165cb2..baf9a61 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -397,11 +397,24 @@
 
 
 !! test
-Italics and bold: 2-quote opening sequence: (2,5)
+Italics and bold: 2-quote opening sequence: (2,5) (php)
+!! options
+php
 !! input
 ''foo'
 !! result
 foo
+
+!!end
+# The PHP parser strips the empty tags out for giggles; parsoid doesn't.
+!! test
+Italics and bold: 2-quote opening sequence: (2,5) (parsoid)
+!! options
+parsoid
+!! input
+''foo'
+!! result
+foo
 
 !!end
 
@@ -441,11 +454,24 @@
 
 
 !! test
-Italics and bold: 3-quote opening sequence: (3,5)
+Italics and bold: 3-quote opening sequence: (3,5) (php)
+!! options
+php
 !! input
 '''foo'
 !! result
 foo
+
+!!end
+# The PHP parser strips the empty tags out for giggles; parsoid doesn't.
+!! test
+Italics and bold: 3-quote opening sequence: (3,5) (parsoid)
+!! options
+parsoid
+!! input
+'''foo'
+!! result
+foo
 
 !!end
 
@@ -485,11 +511,24 @@
 
 
 !! test
-Italics and bold: 4-quote opening sequence: (4,5)
+Italics and bold: 4-quote opening sequence: (4,5) (php)
+!! options
+php
 !! input
 foo'
 !! result
 'foo
+
+!!end
+# The PHP parser strips the empty tags out for giggles; parsoid doesn't.
+!! test
+Italics and bold: 4-quote opening sequence: (4,5) (parsoid)
+!! options
+parsoid
+!! input
+foo'
+!! result
+'foo
 
 !!end
 
@@ -499,11 +538,24 @@
 ###
 
 !! test
-Italics and bold: 5-quote opening sequence: (5,2)
+Italics and bold: 5-quote opening sequence: (5,2) (php)
+!! options
+php
 !! input
 'foo''
 !! result
 foo
+
+!!end
+# Parsoid reverses the nesting order, compared to the PHP parser
+!! test
+Italics and bold: 5-quote opening sequence: (5,2) (parsoid)
+!! options
+parsoid
+!! input
+'foo''
+!! result
+foo
 
 !!end
 
@@ -571,21 +623,47 @@
 
 
 !! test
-Italics and bold: multiple quote sequences: (3,4,2)
+Italics and bold: multiple quote sequences: (3,4,2) (php)
+!! options
+php
 !! input
 '''foobar''
 !! result
 foo'bar
 
 !!end
+# The PHP parser strips the empty tags out for giggles; parsoid doesn't.
+!! test
+Italics and bold: multiple quote sequences: (3,4,2) (parsoid)
+!! options
+parsoid
+!! input
+'''foobar''
+!! result
+foo'bar
+
+!!end
 
 
 !! test
-Italics and bold: multiple quote sequences: (3,4,3)
+Italics and bold: multiple quote sequences: (3,4,3) (php)
+!! options
+php
 !! input
 '''foobar'''
 !! result
 foo'bar
+
+!!end
+# The PHP parser strips the empty tags out for giggles; parsoid doesn't.
+!! test
+Italics and bold: multiple quote sequences: (3,4,3) (parsoid)
+!! options
+parsoid
+!! input
+'''foobar'''
+!! result
+foo'bar
 
 !!end
 
@@ -622,12 +700,30 @@
 !!end
 
 
+# The Parsoid team believes the PHP parser's output on this test is wrong.
+# It only checks for convert-to-bold-on-single-character-word when the word
+# matches with a bold tag ("'''") that is *odd* in the list of quote tokens.
+# This means that the bold token in position 2 (0-indexed) gets converted by
+# parsoid, but doesn't get changed by the PHP parser.
 !! test
-Italics and bold: other quote tests: (3,2,3,3)
+Italics and bold: other quote tests: (3,2,3,3) (php)
+!! options
+php
 !! input
 '''this is about ''foo'''s family'''
 !! result
 'this is about foos family
+
+!!end
+# This is the output the Parsoid team believes to be correct.
+!! test
+Italics and bold: other quote tests: (3,2,3,3) (parsoid)
+!! options
+parsoid
+!! input
+'''this is about ''foo'''s family'''
+!! result
+this is about foo's family
 
 !!end
 
@@ -2932,7 +3028,9 @@
 
 
 !! test
-Unclosed and unmatched quotes
+Unclosed and unmatched quotes (php)
+!! options
+php
 !! input
 'Bold italic text '''with bold deactivated''' in between.'
 
@@ -2959,6 +3057,48 @@
 Bold italic text with italic deactivated in 
between.
 Bold text..
 ..spanning two paragraphs (should not work).
+Bold tag left open
+Italic tag left open
+Normal text.
+This year's election should beat last year's.
+Toms car is bigger than Susans.
+Plain italic's plain
+
+!! end
+# Parsoid inserts an empty bold tag pair at the end of the li

[MediaWiki-commits] [Gerrit] Move definition list parser tests from Parsoid's whitelist i... - change (mediawiki/core)

2013-04-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: Move definition list parser tests from Parsoid's whitelist into 
upstream.
..


Move definition list parser tests from Parsoid's whitelist into upstream.

Parsoid parses certain uses of definition lists differently than the PHP
parser.

Change-Id: I185a805e117fc1b9ee3c0cabc657b48cf39af52b
---
M tests/parser/parserTests.txt
1 file changed, 49 insertions(+), 4 deletions(-)

Approvals:
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index baf9a61..0d7b4e2 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2167,8 +2167,13 @@
 !! end
 
 
+## The Parsoid team believes the following three test exposes a
+## bug in the PHP parser.  (Parsoid team thinks the PHP parser is
+## wrong to close the  after the  containing the .)
 !! test
-Definition Lists: Mixed Lists: Test 1
+Definition Lists: Mixed Lists: Test 1 (php)
+!! options
+php
 !! input
 :;* foo
 ::* bar
@@ -2183,7 +2188,19 @@
 
 
 !! end
-
+!! test
+Definition Lists: Mixed Lists: Test 1 (parsoid)
+!! options
+parsoid
+!! input
+:;* foo
+::* bar
+:; baz
+!! result
+ foo
+ bar
+ baz
+!! end
 
 !! test
 Definition Lists: Mixed Lists: Test 2
@@ -2315,9 +2332,15 @@
 
 !! end
 
+# The Parsoid team disagrees with the PHP parser's seemingly-random
+# rules regarding dd/dt on the next two tests.  Parsoid is more
+# consistent, and recognizes the shared nesting and keeps the
+# still-open tags around until the nesting is complete.
 
 !! test
-Definition Lists: Mixed Lists: Test 11
+Definition Lists: Mixed Lists: Test 11 (php)
+!! options
+php
 !! input
 *#*#;*;;foo :bar
 *#*#;boo :baz
@@ -2335,10 +2358,23 @@
 
 
 !! end
+!! test
+Definition Lists: Mixed Lists: Test 11 (parsoid)
+!! options
+parsoid
+!! input
+*#*#;*;;foo :bar
+*#*#;boo :baz
+!! result
+foo bar
+boo baz
+!! end
 
 
 !! test
-Definition Lists: Weird Ones: Test 1
+Definition Lists: Weird Ones: Test 1 (php)
+!! options
+php
 !! input
 *#;*::;; foo : bar (who uses this?)
 !! result
@@ -2353,6 +2389,15 @@
 
 
 !! end
+!! test
+Definition Lists: Weird Ones: Test 1 (parsoid)
+!! options
+parsoid
+!! input
+*#;*::;; foo : bar (who uses this?)
+!! result
+ 
foo  bar (who uses 
this?)
+!! end
 
 ###
 ### External links

-- 
To view, visit https://gerrit.wikimedia.org/r/57689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I185a805e117fc1b9ee3c0cabc657b48cf39af52b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move table parsing tests from Parsoid's whitelist into upstr... - change (mediawiki/core)

2013-04-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: Move table parsing tests from Parsoid's whitelist into upstream 
parserTests.
..


Move table parsing tests from Parsoid's whitelist into upstream parserTests.

A few more differences between Parsoid and the PHP parser.

Change-Id: Ic12c93fef905b65ffa459bb15920ea7edd9f2238
---
M tests/parser/parserTests.txt
1 file changed, 28 insertions(+), 2 deletions(-)

Approvals:
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 0d7b4e2..55605d0 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -3163,16 +3163,30 @@
 # is the bare minimun required by the spec, see:
 # 
http://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_module_Basic_Tables
 !! test
-A table with no data.
+A table with no data. (php)
+!! options
+php
 !! input
 {||}
 !! result
+!! end
+# Parsoid team replies: empty table tags are legal in HTML5
+!! test
+A table with no data. (parsoid)
+!! options
+parsoid
+!! input
+{||}
+!! result
+
 !! end
 
 # A table with nothing but a caption is invalid XHTML, we might want to render
 # this as caption
 !! test
-A table with nothing but a caption
+A table with nothing but a caption (php)
+!! options
+php
 !! input
 {|
 |+ caption
@@ -3183,6 +3197,18 @@
 
 
 !! end
+# Parsoid team replies: table with only a caption is legal in HTML5
+!! test
+A table with nothing but a caption (parsoid)
+!! options
+parsoid
+!! input
+{|
+|+ caption
+|}
+!! result
+ caption
+!! end
 
 !! test
 A table with caption with default-spaced attributes and a table row

-- 
To view, visit https://gerrit.wikimedia.org/r/57691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic12c93fef905b65ffa459bb15920ea7edd9f2238
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] New parserTest: check interaction of italics and English pos... - change (mediawiki/core)

2013-04-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: New parserTest: check interaction of italics and English 
possessives.
..


New parserTest: check interaction of italics and English possessives.

This documents a current bug in the Parsoid parser.

Change-Id: I242324237640dd21fb24c50fa164a45091e388b8
---
M tests/parser/parserTests.txt
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 55605d0..1d4102c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -363,6 +363,16 @@
 
 !! end
 
+# this example taken from the simple/Moon article
+!! test
+Italics and possessives
+!! input
+obtained by ''[[Lunar Prospector]]'''s gamma-ray spectrometer
+!! result
+obtained by Lunar 
Prospector's gamma-ray spectrometer
+
+!! end
+
 ###
 ### 2-quote opening sequence tests
 ###

-- 
To view, visit https://gerrit.wikimedia.org/r/57748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I242324237640dd21fb24c50fa164a45091e388b8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Subramanya Sastry 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move gerrit-wm from #mediawiki to #mediawiki-feed - change (operations/puppet)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57752


Change subject: Move gerrit-wm from #mediawiki to #mediawiki-feed
..

Move gerrit-wm from #mediawiki to #mediawiki-feed

Change-Id: I10a02bfeb7859e44e295aba4f13633a2327d6cfd
---
M manifests/gerrit.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/57752/1

diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 9816ea3..87b78f5 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -342,9 +342,9 @@
"${ircecho_logbase}/mobile.log"  => 
"#wikimedia-mobile",
"${ircecho_logbase}/parsoid.log" => 
"#mediawiki-parsoid",
"${ircecho_logbase}/visualeditor.log"=> 
"#mediawiki-visualeditor",
-   "${ircecho_logbase}/mediawiki.log"   => 
"#mediawiki",
+   "${ircecho_logbase}/mediawiki.log"   => 
"#mediawiki-feed",
"${ircecho_logbase}/wikimedia-dev.log"   => 
"#wikimedia-dev",
-   "${ircecho_logbase}/semantic-mediawiki.log"  => 
["#semantic-mediawiki", "#mediawiki"],
+   "${ircecho_logbase}/semantic-mediawiki.log"  => 
["#semantic-mediawiki", "#mediawiki-feed"],
"${ircecho_logbase}/wikidata.log"=> 
"#wikimedia-wikidata",
"${ircecho_logbase}/wikimedia-analytics.log" => 
"#wikimedia-analytics",
}

-- 
To view, visit https://gerrit.wikimedia.org/r/57752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10a02bfeb7859e44e295aba4f13633a2327d6cfd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki.log => mediawiki-feed.log - change (wikimedia...wikibugs)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57753


Change subject: mediawiki.log => mediawiki-feed.log
..

mediawiki.log => mediawiki-feed.log

Change-Id: Ic18d7117af94164a4b7dd951dcf53be9dd87b168
---
M wikibugs
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/wikibugs 
refs/changes/53/57753/1

diff --git a/wikibugs b/wikibugs
index d27e9fe..872ffb9 100755
--- a/wikibugs
+++ b/wikibugs
@@ -95,7 +95,7 @@
'Wiktionary App'   => $opt{'dir'} . '/wikimedia-mobile.log',
'Parsoid'  => $opt{'dir'} . '/mediawiki-parsoid.log',
 
-   'default' => $opt{'dir'} . '/mediawiki.log',
+   'default' => $opt{'dir'} . '/mediawiki-feed.log',
 };
 
 # Parse a received email

-- 
To view, visit https://gerrit.wikimedia.org/r/57753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic18d7117af94164a4b7dd951dcf53be9dd87b168
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/wikibugs
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] tell users which username to use for LDAP auth - change (operations/puppet)

2013-04-05 Thread Jeremyb (Code Review)

Jeremyb has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57754


Change subject: tell users which username to use for LDAP auth
..

tell users which username to use for LDAP auth

users log in in with creds where "username" is ambiguous.
tell them which one to use.

rename graphite apache template to .erb

Change-Id: Ie105ea084cf3290dd4d85b856c279896836a9d66
---
M manifests/misc/noc.pp
R templates/apache/sites/graphite.wikimedia.org.erb
M templates/apache/sites/icinga.wikimedia.org.erb
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/57754/1

diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index 9232300..839a5c6 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -20,7 +20,7 @@
source => 
"puppet:///files/apache/sites/noc.wikimedia.org";
"/etc/apache2/sites-available/graphite.wikimedia.org":
path => 
"/etc/apache2/sites-available/graphite.wikimedia.org",
-   content => 
template('apache/sites/graphite.wikimedia.org'),
+   content => 
template('apache/sites/graphite.wikimedia.org.erb'),
mode => 0440,
owner => root,
group => www-data;
diff --git a/templates/apache/sites/graphite.wikimedia.org 
b/templates/apache/sites/graphite.wikimedia.org.erb
similarity index 95%
rename from templates/apache/sites/graphite.wikimedia.org
rename to templates/apache/sites/graphite.wikimedia.org.erb
index e51a10a..da012d2 100644
--- a/templates/apache/sites/graphite.wikimedia.org
+++ b/templates/apache/sites/graphite.wikimedia.org.erb
@@ -15,7 +15,7 @@
Order allow,deny
Allow from all
 
-   AuthName "WMF Labs"
+   AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
@@ -79,7 +79,7 @@
Order allow,deny
Allow from all
 
-   AuthName "WMF Labs"
+   AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
diff --git a/templates/apache/sites/icinga.wikimedia.org.erb 
b/templates/apache/sites/icinga.wikimedia.org.erb
index b4219cd..de65f37 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -101,7 +101,7 @@
AllowOverride AuthConfig
Order Allow,Deny
Allow From All
-   AuthName "WMF Labs"
+   AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org

-- 
To view, visit https://gerrit.wikimedia.org/r/57754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie105ea084cf3290dd4d85b856c279896836a9d66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jeremyb 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] some cleanup for multi_instance mysql - change (operations/puppet)

2013-04-05 Thread Pyoungmeister (Code Review)

Pyoungmeister has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57755


Change subject: some cleanup for multi_instance mysql
..

some cleanup for multi_instance mysql

Change-Id: I628f45907b2ee54edc2fd0e66ed7c54bd47a7ca4
---
M modules/mysql_multi_instance/manifests/init.pp
D modules/mysql_multi_instance/manifests/params.pp
A modules/mysql_multi_instance/templates/root.my.cnf.erb
3 files changed, 9 insertions(+), 156 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/57755/1

diff --git a/modules/mysql_multi_instance/manifests/init.pp 
b/modules/mysql_multi_instance/manifests/init.pp
index 75c79ed..d2a6bcc 100644
--- a/modules/mysql_multi_instance/manifests/init.pp
+++ b/modules/mysql_multi_instance/manifests/init.pp
@@ -40,5 +40,10 @@
 '/etc/mysql/conf.d':
   ensure  => directory,
   mode=> '0755';
+'/root/.my.cnf':
+  owner => root,
+  group => root,
+  mode => 0400,
+  content => template("mysql_multi_instance/root.my.cnf.erb");
   }
 }
diff --git a/modules/mysql_multi_instance/manifests/params.pp 
b/modules/mysql_multi_instance/manifests/params.pp
deleted file mode 100644
index b34ac0b..000
--- a/modules/mysql_multi_instance/manifests/params.pp
+++ /dev/null
@@ -1,156 +0,0 @@
-# Class: mysql::params
-#
-#   The mysql configuration settings.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class mysql_multi_instance::params {
-
-  $bind_address= '127.0.0.1'
-  $port= 3306
-  $etc_root_password   = false
-  $ssl = false
-  $restart = false
-
-  case $::operatingsystem {
-'Ubuntu': {
-  $service_provider = upstart
-}
-default: {
-  $service_provider = undef
-}
-  }
-
-  case $::osfamily {
-'RedHat': {
-  $basedir   = '/usr'
-  $datadir   = '/var/lib/mysql'
-  $service_name  = 'mysqld'
-  $client_package_name   = 'mysql'
-  $server_package_name   = 'mysql-server'
-  $socket= '/var/lib/mysql/mysql.sock'
-  $pidfile   = '/var/run/mysqld/mysqld.pid'
-  $config_file   = '/etc/my.cnf'
-  $log_error = '/var/log/mysqld.log'
-  $ruby_package_name = 'ruby-mysql'
-  $ruby_package_provider = 'gem'
-  $python_package_name   = 'MySQL-python'
-  $php_package_name  = 'php-mysql'
-  $java_package_name = 'mysql-connector-java'
-  $root_group= 'root'
-  $ssl_ca= '/etc/mysql/cacert.pem'
-  $ssl_cert  = '/etc/mysql/server-cert.pem'
-  $ssl_key   = '/etc/mysql/server-key.pem'
-}
-
-'Suse': {
-  $basedir   = '/usr'
-  $datadir   = '/var/lib/mysql'
-  $service_name  = 'mysql'
-  $client_package_name   = $::operatingsystem ? {
-/OpenSuSE/   => 'mysql-community-server-client',
-/(SLES|SLED)/=> 'mysql-client',
-}
-  $server_package_name   = $::operatingsystem ? {
-/OpenSuSE/   => 'mysql-community-server',
-/(SLES|SLED)/=> 'mysql',
-}
-  $socket= $::operatingsystem ? {
-/OpenSuSE/   => '/var/run/mysql/mysql.sock',
-/(SLES|SLED)/=> '/var/lib/mysql/mysql.sock',
-}
-  $pidfile   = '/var/run/mysql/mysqld.pid'
-  $config_file   = '/etc/my.cnf'
-  $log_error = $::operatingsystem ? {
-/OpenSuSE/   => '/var/log/mysql/mysqld.log',
-/(SLES|SLED)/=> '/var/log/mysqld.log',
-}
-  $ruby_package_name = $::operatingsystem ? {
-/OpenSuSE/   => 'rubygem-mysql',
-/(SLES|SLED)/=> 'ruby-mysql',
-}
-  $python_package_name   = 'python-mysql'
-  $java_package_name = 'mysql-connector-java'
-  $root_group= 'root'
-  $ssl_ca= '/etc/mysql/cacert.pem'
-  $ssl_cert  = '/etc/mysql/server-cert.pem'
-  $ssl_key   = '/etc/mysql/server-key.pem'
-}
-
-'Debian': {
-  $basedir  = '/usr'
-  $datadir  = '/a/sqldata/'
-  $service_name = 'mysql'
-  $client_package_name  = 'mysql-client'
-  $server_package_name  = 'mysql-server'
-  $socket   = "/tmp/mysqld.sock"
-  $pidfile  = "/a/sqldata/${::hostname}.pid"
-  $config_file  = '/etc/mysql/my.cnf'
-  $log_error= "/a/sqldata/${::hostname}.log"
-  $ruby_package_name= 'libmysql-ruby'
-  $python_package_name  = 'python-mysqldb'
-  $php_package_name = 'php5-mysql'
-  $java_package_name= 'libmysql-java'
-  $root_group   = 'root'
-  $ssl_ca   = '/etc/mysql/cacert.pem'
-

[MediaWiki-commits] [Gerrit] Remove Special:ActiveUsers - change (mediawiki/core)

2013-04-05 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57756


Change subject: Remove Special:ActiveUsers
..

Remove Special:ActiveUsers

This feature was poorly thought out from the start. It's a huge
performance drain when used, for a mimimally useful set of data

Change-Id: I138622e1c184f74e2a7ce13a9a544ab4e610d7a0
---
M RELEASE-NOTES-1.21
M includes/AutoLoader.php
M includes/SpecialPageFactory.php
D includes/specials/SpecialActiveusers.php
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
7 files changed, 1 insertion(+), 277 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/57756/1

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 295eb7b..4dbccc9 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -326,6 +326,7 @@
   - ShowStats -> ShowSiteStats.
 * BREAKING CHANGE: (bug 38244) Removed the mediawiki.api.titleblacklist module
   and moved it to the TitleBlacklist extension.
+* The Special:ActiveUsers special page was removed
 
 == Compatibility ==
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5bd057a..84f5caa 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -891,7 +891,6 @@
'SiteStore' => 'includes/site/SiteStore.php',
 
# includes/specials
-   'ActiveUsersPager' => 'includes/specials/SpecialActiveusers.php',
'AllmessagesTablePager' => 'includes/specials/SpecialAllmessages.php',
'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
'BlockListPager' => 'includes/specials/SpecialBlockList.php',
@@ -936,7 +935,6 @@
'ProtectedTitlesPager' => 
'includes/specials/SpecialProtectedtitles.php',
'RandomPage' => 'includes/specials/SpecialRandompage.php',
'ShortPagesPage' => 'includes/specials/SpecialShortpages.php',
-   'SpecialActiveUsers' => 'includes/specials/SpecialActiveusers.php',
'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php',
'SpecialAllpages' => 'includes/specials/SpecialAllpages.php',
'SpecialBlankpage' => 'includes/specials/SpecialBlankpage.php',
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 7368ab7..7c639d0 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -99,7 +99,6 @@
'Listusers' => 'SpecialListUsers',
'Listadmins'=> 'SpecialListAdmins',
'Listbots'  => 'SpecialListBots',
-   'Activeusers'   => 'SpecialActiveUsers',
'Userrights'=> 'UserrightsPage',
'EditWatchlist' => 'SpecialEditWatchlist',
 
diff --git a/includes/specials/SpecialActiveusers.php 
b/includes/specials/SpecialActiveusers.php
deleted file mode 100644
index c9c82ad..000
--- a/includes/specials/SpecialActiveusers.php
+++ /dev/null
@@ -1,250 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * This class is used to get a list of active users. The ones with specials
- * rights (sysop, bureaucrat, developer) will have them displayed
- * next to their names.
- *
- * @ingroup SpecialPage
- */
-class ActiveUsersPager extends UsersPager {
-
-   /**
-* @var FormOptions
-*/
-   protected $opts;
-
-   /**
-* @var Array
-*/
-   protected $hideGroups = array();
-
-   /**
-* @var Array
-*/
-   protected $hideRights = array();
-
-   /**
-* @param $context IContextSource
-* @param $group null Unused
-* @param string $par Parameter passed to the page
-*/
-   function __construct( IContextSource $context = null, $group = null, 
$par = null ) {
-   global $wgActiveUserDays;
-
-   parent::__construct( $context );
-
-   $this->RCMaxAge = $wgActiveUserDays;
-   $un = $this->getRequest()->getText( 'username', $par );
-   $this->requestedUser = '';
-   if ( $un != '' ) {
-   $username = Title::makeTitleSafe( NS_USER, $un );
-   if( !is_null( $username ) ) {
-   $this->requestedUser = $username->getText();
-   }
-   }
-
-   $this->setupOptions();
-   }
-
-   public function setupOptions() {
-   $this->opts = new FormOptions();
-
-   $this->opts->add( 'hidebots', false, FormOptions::BOOL );
-   $this->opts->add( 'hidesysops', false, FormOptions::BOOL );
-
-   $this->opts->fetchValuesFromRequest( $this->getRequest() );
-
-   if ( $this->opts->getValue( 'hidebots' ) == 1 ) {
-   $this->hideRights[] = 'bot';

[MediaWiki-commits] [Gerrit] Remove Special:ActiveUsers - change (mediawiki/core)

2013-04-05 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Remove Special:ActiveUsers
..


Remove Special:ActiveUsers

This feature was poorly thought out from the start. It's a huge
performance drain when used, for a mimimally useful set of data

Change-Id: I138622e1c184f74e2a7ce13a9a544ab4e610d7a0
---
M RELEASE-NOTES-1.21
M includes/AutoLoader.php
M includes/SpecialPageFactory.php
D includes/specials/SpecialActiveusers.php
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
7 files changed, 1 insertion(+), 277 deletions(-)

Approvals:
  Reedy: Verified; Looks good to me, approved



diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 295eb7b..4dbccc9 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -326,6 +326,7 @@
   - ShowStats -> ShowSiteStats.
 * BREAKING CHANGE: (bug 38244) Removed the mediawiki.api.titleblacklist module
   and moved it to the TitleBlacklist extension.
+* The Special:ActiveUsers special page was removed
 
 == Compatibility ==
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5bd057a..84f5caa 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -891,7 +891,6 @@
'SiteStore' => 'includes/site/SiteStore.php',
 
# includes/specials
-   'ActiveUsersPager' => 'includes/specials/SpecialActiveusers.php',
'AllmessagesTablePager' => 'includes/specials/SpecialAllmessages.php',
'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
'BlockListPager' => 'includes/specials/SpecialBlockList.php',
@@ -936,7 +935,6 @@
'ProtectedTitlesPager' => 
'includes/specials/SpecialProtectedtitles.php',
'RandomPage' => 'includes/specials/SpecialRandompage.php',
'ShortPagesPage' => 'includes/specials/SpecialShortpages.php',
-   'SpecialActiveUsers' => 'includes/specials/SpecialActiveusers.php',
'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php',
'SpecialAllpages' => 'includes/specials/SpecialAllpages.php',
'SpecialBlankpage' => 'includes/specials/SpecialBlankpage.php',
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 7368ab7..7c639d0 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -99,7 +99,6 @@
'Listusers' => 'SpecialListUsers',
'Listadmins'=> 'SpecialListAdmins',
'Listbots'  => 'SpecialListBots',
-   'Activeusers'   => 'SpecialActiveUsers',
'Userrights'=> 'UserrightsPage',
'EditWatchlist' => 'SpecialEditWatchlist',
 
diff --git a/includes/specials/SpecialActiveusers.php 
b/includes/specials/SpecialActiveusers.php
deleted file mode 100644
index c9c82ad..000
--- a/includes/specials/SpecialActiveusers.php
+++ /dev/null
@@ -1,250 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup SpecialPage
- */
-
-/**
- * This class is used to get a list of active users. The ones with specials
- * rights (sysop, bureaucrat, developer) will have them displayed
- * next to their names.
- *
- * @ingroup SpecialPage
- */
-class ActiveUsersPager extends UsersPager {
-
-   /**
-* @var FormOptions
-*/
-   protected $opts;
-
-   /**
-* @var Array
-*/
-   protected $hideGroups = array();
-
-   /**
-* @var Array
-*/
-   protected $hideRights = array();
-
-   /**
-* @param $context IContextSource
-* @param $group null Unused
-* @param string $par Parameter passed to the page
-*/
-   function __construct( IContextSource $context = null, $group = null, 
$par = null ) {
-   global $wgActiveUserDays;
-
-   parent::__construct( $context );
-
-   $this->RCMaxAge = $wgActiveUserDays;
-   $un = $this->getRequest()->getText( 'username', $par );
-   $this->requestedUser = '';
-   if ( $un != '' ) {
-   $username = Title::makeTitleSafe( NS_USER, $un );
-   if( !is_null( $username ) ) {
-   $this->requestedUser = $username->getText();
-   }
-   }
-
-   $this->setupOptions();
-   }
-
-   public function setupOptions() {
-   $this->opts = new FormOptions();
-
-   $this->opts->add( 'hidebots', false, FormOptions::BOOL );
-   $this->opts->add( 'hidesysops', false, FormOptions::BOOL );
-
-   $this->opts->fetchValuesFromRequest( $this->getRequest() );
-
-   if ( $this->opts->getValue( 'hidebots' ) == 1 ) {
-   $this->hideRights[] = 'bot';
-   }
-   if ( $this->opts->getValu

[MediaWiki-commits] [Gerrit] (Bug 46930) changeTitle only create redirect where redirid > 0 - change (mediawiki...SemanticMediaWiki)

2013-04-05 Thread Mwjames (Code Review)

Mwjames has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57757


Change subject: (Bug 46930) changeTitle only create redirect where redirid > 0
..

(Bug 46930) changeTitle only create redirect where redirid > 0

changeTitle would create always a redirect entry even though
Title:moveTo() explicitly sets createRedirect to false but changeTitle
never checked redirid therefore smw_fpt_redi conatins gost redirects
for pages that did not any expect redirects and already deleted
(Special:MovePage - > Leave a redirect behind unchecked)

Change-Id: Ibad8cd133cc985656346769787698a8519f5e58e
---
M includes/storage/SQLStore/SMW_SQLStore3_Writers.php
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki 
refs/changes/57/57757/1

diff --git a/includes/storage/SQLStore/SMW_SQLStore3_Writers.php 
b/includes/storage/SQLStore/SMW_SQLStore3_Writers.php
index 9020da6..c1b9d4e 100644
--- a/includes/storage/SQLStore/SMW_SQLStore3_Writers.php
+++ b/includes/storage/SQLStore/SMW_SQLStore3_Writers.php
@@ -718,6 +718,17 @@
// (this also updates references in other tables as 
needed.)
/// TODO: may not be optimal for the standard case that 
newtitle existed and redirected to oldtitle (PERFORMANCE)
$this->updateRedirects( $oldtitle->getDBkey(), 
$oldtitle->getNamespace(), $newtitle->getDBkey(), $newtitle->getNamespace() );
+
+   // $redirid == 0 means that the oldTitle was not 
supposed to be a redirect
+   // (oldTitle is delete from the db) but instead of 
deleting all
+   // references we will still copy data from old to new 
during updateRedirects()
+   // and clear the semantic data container for the 
oldTitle instance
+   // to ensure that no ghost references exists for an 
deleted oldTitle
+   // @see Title::moveTo(), createRedirect
+   if ( $redirid == 0 ) {
+   // Delete any existing data (including 
redirects) from old title
+   $this->doDataUpdate( new SMWSemanticData( 
SMWDIWikiPage::newFromTitle( $oldtitle ) ) );
+   }
}
 
wfProfileOut( "SMWSQLStore3::changeTitle (SMW)" );

-- 
To view, visit https://gerrit.wikimedia.org/r/57757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibad8cd133cc985656346769787698a8519f5e58e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] s1: moving watchlist to db1049, pulling db1043, adding db1056 - change (operations/mediawiki-config)

2013-04-05 Thread Asher (Code Review)

Asher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57758


Change subject: s1: moving watchlist to db1049, pulling db1043, adding db1056
..

s1: moving watchlist to db1049, pulling db1043, adding db1056

Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf
---
M wmf-config/db-eqiad.php
1 file changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/58/57758/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 65c93c5..933fd5e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -85,15 +85,15 @@
 #
 'sectionLoads' => array(
's1' => array(
-   'db1017'=> 0, # 1.4TB
+   'db1017'=> 0, # 1.4TB 64GB
#'db1001'=> 100, # 1.4TB sas
-   'db1042'=> 400, # 1.4TB sas
-   'db1043'=> 400, # 1.4TB sas, normall special contrib, 
watchlist, etc 64GB
-   'db1049'=> 50, # 2.8TB sas 64GB future watchlist
-   'db1050'=> 50, # snapshot 2.8TB sas 64GB
+   'db1042'=> 400, # 1.4TB sas 64GB
+   #'db1043'=> 400, # 1.4TB sas 64GB
+   'db1049'=> 50, # 2.8TB sas 64GB watchlist
+   #'db1050'=> 50, # snapshot 2.8TB sas 64GB
'db1051'=> 400, # 2.8TB sas 96GB
-   'db1052'=> 50, # 2.8TB sas 96GB
-   #'db1056'=> 400, # 2.8TB sas 96GB future master
+   'db1052'=> 400, # 2.8TB sas 96GB
+   'db1056'=> 400, # 2.8TB sas 96GB future master
),
's2' => array(
'db1034'=> 0,
@@ -157,13 +157,13 @@
 'groupLoadsByDB' => array(
'enwiki' => array(
'watchlist' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'recentchangeslinked' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'contributions' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'dump' => array(
'db1052' => 1,

-- 
To view, visit https://gerrit.wikimedia.org/r/57758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] some cleanup for multi_instance mysql - change (operations/puppet)

2013-04-05 Thread Pyoungmeister (Code Review)

Pyoungmeister has submitted this change and it was merged.

Change subject: some cleanup for multi_instance mysql
..


some cleanup for multi_instance mysql

Change-Id: I628f45907b2ee54edc2fd0e66ed7c54bd47a7ca4
---
M modules/mysql_multi_instance/manifests/init.pp
D modules/mysql_multi_instance/manifests/params.pp
A modules/mysql_multi_instance/templates/root.my.cnf.erb
3 files changed, 9 insertions(+), 156 deletions(-)

Approvals:
  Pyoungmeister: Verified; Looks good to me, approved



diff --git a/modules/mysql_multi_instance/manifests/init.pp 
b/modules/mysql_multi_instance/manifests/init.pp
index 75c79ed..d2a6bcc 100644
--- a/modules/mysql_multi_instance/manifests/init.pp
+++ b/modules/mysql_multi_instance/manifests/init.pp
@@ -40,5 +40,10 @@
 '/etc/mysql/conf.d':
   ensure  => directory,
   mode=> '0755';
+'/root/.my.cnf':
+  owner => root,
+  group => root,
+  mode => 0400,
+  content => template("mysql_multi_instance/root.my.cnf.erb");
   }
 }
diff --git a/modules/mysql_multi_instance/manifests/params.pp 
b/modules/mysql_multi_instance/manifests/params.pp
deleted file mode 100644
index b34ac0b..000
--- a/modules/mysql_multi_instance/manifests/params.pp
+++ /dev/null
@@ -1,156 +0,0 @@
-# Class: mysql::params
-#
-#   The mysql configuration settings.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class mysql_multi_instance::params {
-
-  $bind_address= '127.0.0.1'
-  $port= 3306
-  $etc_root_password   = false
-  $ssl = false
-  $restart = false
-
-  case $::operatingsystem {
-'Ubuntu': {
-  $service_provider = upstart
-}
-default: {
-  $service_provider = undef
-}
-  }
-
-  case $::osfamily {
-'RedHat': {
-  $basedir   = '/usr'
-  $datadir   = '/var/lib/mysql'
-  $service_name  = 'mysqld'
-  $client_package_name   = 'mysql'
-  $server_package_name   = 'mysql-server'
-  $socket= '/var/lib/mysql/mysql.sock'
-  $pidfile   = '/var/run/mysqld/mysqld.pid'
-  $config_file   = '/etc/my.cnf'
-  $log_error = '/var/log/mysqld.log'
-  $ruby_package_name = 'ruby-mysql'
-  $ruby_package_provider = 'gem'
-  $python_package_name   = 'MySQL-python'
-  $php_package_name  = 'php-mysql'
-  $java_package_name = 'mysql-connector-java'
-  $root_group= 'root'
-  $ssl_ca= '/etc/mysql/cacert.pem'
-  $ssl_cert  = '/etc/mysql/server-cert.pem'
-  $ssl_key   = '/etc/mysql/server-key.pem'
-}
-
-'Suse': {
-  $basedir   = '/usr'
-  $datadir   = '/var/lib/mysql'
-  $service_name  = 'mysql'
-  $client_package_name   = $::operatingsystem ? {
-/OpenSuSE/   => 'mysql-community-server-client',
-/(SLES|SLED)/=> 'mysql-client',
-}
-  $server_package_name   = $::operatingsystem ? {
-/OpenSuSE/   => 'mysql-community-server',
-/(SLES|SLED)/=> 'mysql',
-}
-  $socket= $::operatingsystem ? {
-/OpenSuSE/   => '/var/run/mysql/mysql.sock',
-/(SLES|SLED)/=> '/var/lib/mysql/mysql.sock',
-}
-  $pidfile   = '/var/run/mysql/mysqld.pid'
-  $config_file   = '/etc/my.cnf'
-  $log_error = $::operatingsystem ? {
-/OpenSuSE/   => '/var/log/mysql/mysqld.log',
-/(SLES|SLED)/=> '/var/log/mysqld.log',
-}
-  $ruby_package_name = $::operatingsystem ? {
-/OpenSuSE/   => 'rubygem-mysql',
-/(SLES|SLED)/=> 'ruby-mysql',
-}
-  $python_package_name   = 'python-mysql'
-  $java_package_name = 'mysql-connector-java'
-  $root_group= 'root'
-  $ssl_ca= '/etc/mysql/cacert.pem'
-  $ssl_cert  = '/etc/mysql/server-cert.pem'
-  $ssl_key   = '/etc/mysql/server-key.pem'
-}
-
-'Debian': {
-  $basedir  = '/usr'
-  $datadir  = '/a/sqldata/'
-  $service_name = 'mysql'
-  $client_package_name  = 'mysql-client'
-  $server_package_name  = 'mysql-server'
-  $socket   = "/tmp/mysqld.sock"
-  $pidfile  = "/a/sqldata/${::hostname}.pid"
-  $config_file  = '/etc/mysql/my.cnf'
-  $log_error= "/a/sqldata/${::hostname}.log"
-  $ruby_package_name= 'libmysql-ruby'
-  $python_package_name  = 'python-mysqldb'
-  $php_package_name = 'php5-mysql'
-  $java_package_name= 'libmysql-java'
-  $root_group   = 'root'
-  $ssl_ca   = '/etc/mysql/cacert.pem'
-  $ssl_cert = '/etc/mysql/server-cert.pem'

[MediaWiki-commits] [Gerrit] s1: moving watchlist to db1049, pulling db1043, adding db1056 - change (operations/mediawiki-config)

2013-04-05 Thread Asher (Code Review)

Asher has submitted this change and it was merged.

Change subject: s1: moving watchlist to db1049, pulling db1043, adding db1056
..


s1: moving watchlist to db1049, pulling db1043, adding db1056

Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf
---
M wmf-config/db-eqiad.php
1 file changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Asher: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 65c93c5..933fd5e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -85,15 +85,15 @@
 #
 'sectionLoads' => array(
's1' => array(
-   'db1017'=> 0, # 1.4TB
+   'db1017'=> 0, # 1.4TB 64GB
#'db1001'=> 100, # 1.4TB sas
-   'db1042'=> 400, # 1.4TB sas
-   'db1043'=> 400, # 1.4TB sas, normall special contrib, 
watchlist, etc 64GB
-   'db1049'=> 50, # 2.8TB sas 64GB future watchlist
-   'db1050'=> 50, # snapshot 2.8TB sas 64GB
+   'db1042'=> 400, # 1.4TB sas 64GB
+   #'db1043'=> 400, # 1.4TB sas 64GB
+   'db1049'=> 50, # 2.8TB sas 64GB watchlist
+   #'db1050'=> 50, # snapshot 2.8TB sas 64GB
'db1051'=> 400, # 2.8TB sas 96GB
-   'db1052'=> 50, # 2.8TB sas 96GB
-   #'db1056'=> 400, # 2.8TB sas 96GB future master
+   'db1052'=> 400, # 2.8TB sas 96GB
+   'db1056'=> 400, # 2.8TB sas 96GB future master
),
's2' => array(
'db1034'=> 0,
@@ -157,13 +157,13 @@
 'groupLoadsByDB' => array(
'enwiki' => array(
'watchlist' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'recentchangeslinked' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'contributions' => array(
-   'db1052' => 1,
+   'db1049' => 1,
),
'dump' => array(
'db1052' => 1,

-- 
To view, visit https://gerrit.wikimedia.org/r/57758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher 
Gerrit-Reviewer: Asher 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] including cpufrequtils in the sanitarium/labsdb db class - change (operations/puppet)

2013-04-05 Thread Pyoungmeister (Code Review)

Pyoungmeister has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57759


Change subject: including cpufrequtils in the sanitarium/labsdb db class
..

including cpufrequtils in the sanitarium/labsdb db class

Change-Id: I927a757e4b45aa3dd094dcc79a0f7e87a2bc7c8a
---
M manifests/role/db.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/57759/1

diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 05973ce..b51473d 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -21,6 +21,7 @@
system_role {"role::db::sanitarium": description => "pre-labsdb dbs for 
Data Sanitization" }
 
include standard,
+cpufrequtils,
 mysql_multi_instance
 
class { mysql :

-- 
To view, visit https://gerrit.wikimedia.org/r/57759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I927a757e4b45aa3dd094dcc79a0f7e87a2bc7c8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] including cpufrequtils in the sanitarium/labsdb db class - change (operations/puppet)

2013-04-05 Thread Pyoungmeister (Code Review)

Pyoungmeister has submitted this change and it was merged.

Change subject: including cpufrequtils in the sanitarium/labsdb db class
..


including cpufrequtils in the sanitarium/labsdb db class

Change-Id: I927a757e4b45aa3dd094dcc79a0f7e87a2bc7c8a
---
M manifests/role/db.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Pyoungmeister: Verified; Looks good to me, approved



diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 05973ce..b51473d 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -21,6 +21,7 @@
system_role {"role::db::sanitarium": description => "pre-labsdb dbs for 
Data Sanitization" }
 
include standard,
+cpufrequtils,
 mysql_multi_instance
 
class { mysql :

-- 
To view, visit https://gerrit.wikimedia.org/r/57759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I927a757e4b45aa3dd094dcc79a0f7e87a2bc7c8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister 
Gerrit-Reviewer: Pyoungmeister 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] converting db1050 (s1 snapshot) to mariadb and file-per-table - change (operations/puppet)

2013-04-05 Thread Asher (Code Review)

Asher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57760


Change subject: converting db1050 (s1 snapshot) to mariadb and file-per-table
..

converting db1050 (s1 snapshot) to mariadb and file-per-table

Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/57760/1

diff --git a/manifests/site.pp b/manifests/site.pp
index d7dba22..6cadfc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -525,7 +525,7 @@
include mha::manager
}
 
-   if $hostname =~ /^db10(51|52|56)/ {
+   if $hostname =~ /^db10(50|51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, 
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }

-- 
To view, visit https://gerrit.wikimedia.org/r/57760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Initial code upload, WIP - change (operations...libvmod-netmapper)

2013-04-05 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57761


Change subject: Initial code upload, WIP
..

Initial code upload, WIP

Change-Id: I67cbaf13366700762506e272839e2287a8024d94
---
A .gitignore
A COPYING
A LICENSE
A Makefile.am
A README.rst
A acaux/.gitignore
A autogen.sh
A configure.ac
A m4/.gitignore
A src/.gitignore
A src/Makefile.am
A src/tests/test01.vtc
A src/vmod_netmapper.c
A src/vmod_netmapper.vcc
14 files changed, 568 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/61/57761/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..748ee22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+# Autotools junk at top level
+/autom4te.cache/
+/aclocal.m4
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/libtool
+/stamp-h1
+
+# Various tool outputs in all dirs
+Makefile
+Makefile.in
+.dirstamp
+.deps
+.libs
+*.o
+*.so
+*.lo
+*.la
+*.gcov
+*.trucov
+*.info
+*.gcda
+*.gcno
+*.tmp
+*.log
+*.trs
+*~
+
+# Generated manpages
+*.[0-9]
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..f792696
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,7 @@
+Copyright (c) 2011 Varnish Software AS
+...
+See LICENSE for details.
+
+You're free to use and distribute this under terms in the
+LICENSE. Please add your relevant copyright statements.
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..264d421
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000..d7dcb2b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,21 @@
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src
+
+EXTRA_DIST = README.rst
+
+dist_man_MANS = vmod_netmapper.3
+MAINTAINERCLEANFILES = $(dist_man_MANS)
+
+vmod_netmapper.3: README.rst
+
+%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
+if HAVE_RST2MAN
+   ${RST2MAN} $< $@
+else
+   @echo ""
+   @echo "You need rst2man installed to make dist"
+   @echo ""
+   @false
+endif
+
diff --git a/README.rst b/README.rst
new file mode 100644
index 000..ed81b0b
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,100 @@
+=
+libvmod_netmapper
+=
+
+XXX this project was recently copied from vmod_example.  Things like docs
+are not at all up to date with the experimental code!
+
+-
+Varnish module to map an IP address to a string
+-
+
+:Author: Martin Blix Grydeland
+:Date: 2011-05-26
+:Version: 1.0
+:Manual section: 3
+
+SYNOPSIS
+
+
+import netmapper;
+
+DESCRIPTION
+===
+
+Example Varnish vmod demonstrating how to write an out-of-tree Varnish vmod
+for Varnish 3.0 and later.
+
+Implements the traditional Hello World as a vmod.
+
+FUNCTIONS
+=
+
+hello
+-
+
+Prototype
+::
+
+hello(STRING S)
+Return value
+   STRING
+Description
+   Returns "Hello, " prepended to S
+Example
+::
+
+set resp.http.hello = netmapper.hello("World");
+
+INSTALLATION
+
+
+This is an netmapper skeleton for developing out-of-tree Varnish
+vmods available from the 3.0 release. It implements the "Hello, World!" 
+as a vmod callback. Not particularly useful in good hello world 
+tradition,but demonstrates how to get the glue around a vmod working.
+
+The source tree is based on autotools to configure the building, and
+does also have the necessary bits in place to do functional unit tests
+using the varnishtest tool.
+
+Usage::
+
+ ./confi

[MediaWiki-commits] [Gerrit] converting db1050 (s1 snapshot) to mariadb and file-per-table - change (operations/puppet)

2013-04-05 Thread Asher (Code Review)

Asher has submitted this change and it was merged.

Change subject: converting db1050 (s1 snapshot) to mariadb and file-per-table
..


converting db1050 (s1 snapshot) to mariadb and file-per-table

Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Asher: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index d7dba22..6cadfc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -525,7 +525,7 @@
include mha::manager
}
 
-   if $hostname =~ /^db10(51|52|56)/ {
+   if $hostname =~ /^db10(50|51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, 
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }

-- 
To view, visit https://gerrit.wikimedia.org/r/57760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 
Gerrit-Reviewer: Asher 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] init.d-style loading of configs from ./settings - change (mediawiki/vagrant)

2013-04-05 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57762


Change subject: init.d-style loading of configs from ./settings
..

init.d-style loading of configs from ./settings

See settings/README (included in commit) for explanation and rationale.

Change-Id: I7d7e402d547f9e47b98b97d2c1793754db801ed4
---
M LocalSettings.php
A settings/.gitignore
A settings/10-VisualEditor.php-sample
A settings/README
4 files changed, 65 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/62/57762/1

diff --git a/LocalSettings.php b/LocalSettings.php
index e4a37e1..2558480 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -39,3 +39,10 @@
$wgProfiler['class'] = $cls;
}
 }
+
+// Load configuration snippets from ./settings. See settings/README.
+foreach( glob( __DIR__ . '/settings/*.php' ) as $snippet ) {
+   if ( !include_once( $snippet ) ) {
+   echo "Failed to load \"$snippet\".\n";
+   }
+}
diff --git a/settings/.gitignore b/settings/.gitignore
new file mode 100644
index 000..078b995
--- /dev/null
+++ b/settings/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!README
+!10-VisualEditor.php-sample
diff --git a/settings/10-VisualEditor.php-sample 
b/settings/10-VisualEditor.php-sample
new file mode 100644
index 000..570442d
--- /dev/null
+++ b/settings/10-VisualEditor.php-sample
@@ -0,0 +1,27 @@
+http://www.mediawiki.org/wiki/Extension:VisualEditor>.
+
+require_once("$IP/extensions/VisualEditor/VisualEditor.php");
+
+// Create VisualEditor namespace
+define( 'NS_VISUALEDITOR', 2500 );
+define( 'NS_VISUALEDITOR_TALK', 2501 );
+$wgExtraNamespaces[NS_VISUALEDITOR] = 'VisualEditor';
+$wgExtraNamespaces[NS_VISUALEDITOR_TALK] = 'VisualEditor_talk';
+
+// Allow using VisualEditor in the main namespace only (default)
+$wgVisualEditorNamespaces = array( NS_MAIN );
+
+// Restrict VisualEditor to the VisualEditor namespace
+$wgVisualEditorNamespaces = array();
+$wgVisualEditorNamespaces[] = NS_VISUALEDITOR;
+
+// Enable by default for everybody
+$wgDefaultUserOptions['visualeditor-enable'] = 1;
+
+// Don't allow users to disable it
+$wgHiddenPrefs[] = 'visualeditor-enable';
+
+// vim: set ft=php:
diff --git a/settings/README b/settings/README
new file mode 100644
index 000..885480f
--- /dev/null
+++ b/settings/README
@@ -0,0 +1,27 @@
+  _
+ //
+   .--.;(_\
+  /\   /\_/
+ |.---./  /  /
+  \ C'  '>'| /  /   PHP files placed in this directory will be
+   ';   - / /  /automatically loaded, in alphabetical order, by
+   __)---;/`  / LocalSettings.php.
+   _.-' \`"""`|  /
+ .'_/  \/   Rather than clutter LocalSettings.php with the
+ \  -;'|   |configuration variables and require statements for 
every
+  '-._/-.  |extension you wish to load, collect all the 
configurations
+  \(-\ |in a single file and place it in this directory. This
+   |---|makes it quite easy to keep your settings organized, to
+   |J  |remove or temporarily disable the additional settings, 
and
+   ||  |to share settings with others.
+   |;  |
+   |   /|  \This directory is accessible as
+   | _/ T  /'/vagrant/settings' in the guest environment.
+   |  | |  |
+   |  | |__|_   Because the files load alphabeticallly, you can use a
+   |__| '-.__)  two-digit prefix to tweak the load order -- e.g.:
+  jgs  \__)
+settings/
+├── 10-RunFirst.php
+├── 20-SomeExtension.php
+└── 99-RunLast.php

-- 
To view, visit https://gerrit.wikimedia.org/r/57762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d7e402d547f9e47b98b97d2c1793754db801ed4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] init.d-style loading of configs from ./settings - change (mediawiki/vagrant)

2013-04-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: init.d-style loading of configs from ./settings
..


init.d-style loading of configs from ./settings

See settings/README (included in commit) for explanation and rationale.

Change-Id: I7d7e402d547f9e47b98b97d2c1793754db801ed4
---
M LocalSettings.php
A settings/.gitignore
A settings/10-VisualEditor.php-sample
A settings/README
4 files changed, 65 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/LocalSettings.php b/LocalSettings.php
index e4a37e1..2558480 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -39,3 +39,10 @@
$wgProfiler['class'] = $cls;
}
 }
+
+// Load configuration snippets from ./settings. See settings/README.
+foreach( glob( __DIR__ . '/settings/*.php' ) as $snippet ) {
+   if ( !include_once( $snippet ) ) {
+   echo "Failed to load \"$snippet\".\n";
+   }
+}
diff --git a/settings/.gitignore b/settings/.gitignore
new file mode 100644
index 000..078b995
--- /dev/null
+++ b/settings/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!README
+!10-VisualEditor.php-sample
diff --git a/settings/10-VisualEditor.php-sample 
b/settings/10-VisualEditor.php-sample
new file mode 100644
index 000..570442d
--- /dev/null
+++ b/settings/10-VisualEditor.php-sample
@@ -0,0 +1,27 @@
+http://www.mediawiki.org/wiki/Extension:VisualEditor>.
+
+require_once("$IP/extensions/VisualEditor/VisualEditor.php");
+
+// Create VisualEditor namespace
+define( 'NS_VISUALEDITOR', 2500 );
+define( 'NS_VISUALEDITOR_TALK', 2501 );
+$wgExtraNamespaces[NS_VISUALEDITOR] = 'VisualEditor';
+$wgExtraNamespaces[NS_VISUALEDITOR_TALK] = 'VisualEditor_talk';
+
+// Allow using VisualEditor in the main namespace only (default)
+$wgVisualEditorNamespaces = array( NS_MAIN );
+
+// Restrict VisualEditor to the VisualEditor namespace
+$wgVisualEditorNamespaces = array();
+$wgVisualEditorNamespaces[] = NS_VISUALEDITOR;
+
+// Enable by default for everybody
+$wgDefaultUserOptions['visualeditor-enable'] = 1;
+
+// Don't allow users to disable it
+$wgHiddenPrefs[] = 'visualeditor-enable';
+
+// vim: set ft=php:
diff --git a/settings/README b/settings/README
new file mode 100644
index 000..885480f
--- /dev/null
+++ b/settings/README
@@ -0,0 +1,27 @@
+  _
+ //
+   .--.;(_\
+  /\   /\_/
+ |.---./  /  /
+  \ C'  '>'| /  /   PHP files placed in this directory will be
+   ';   - / /  /automatically loaded, in alphabetical order, by
+   __)---;/`  / LocalSettings.php.
+   _.-' \`"""`|  /
+ .'_/  \/   Rather than clutter LocalSettings.php with the
+ \  -;'|   |configuration variables and require statements for 
every
+  '-._/-.  |extension you wish to load, collect all the 
configurations
+  \(-\ |in a single file and place it in this directory. This
+   |---|makes it quite easy to keep your settings organized, to
+   |J  |remove or temporarily disable the additional settings, 
and
+   ||  |to share settings with others.
+   |;  |
+   |   /|  \This directory is accessible as
+   | _/ T  /'/vagrant/settings' in the guest environment.
+   |  | |  |
+   |  | |__|_   Because the files load alphabeticallly, you can use a
+   |__| '-.__)  two-digit prefix to tweak the load order -- e.g.:
+  jgs  \__)
+settings/
+├── 10-RunFirst.php
+├── 20-SomeExtension.php
+└── 99-RunLast.php

-- 
To view, visit https://gerrit.wikimedia.org/r/57762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d7e402d547f9e47b98b97d2c1793754db801ed4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix paths to getJobQueueLengths.php from g37441 - change (operations/puppet)

2013-04-05 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Fix paths to getJobQueueLengths.php from g37441
..


Fix paths to getJobQueueLengths.php from g37441

Change-Id: I9f04f8b3b7b39fadf9d55dd7e16b518bbd8a6b47
---
M manifests/ganglia.pp
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 429eaab..b96a61a 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -626,7 +626,7 @@
 
cron {
all_jobqueue_length:
-   command => "/usr/bin/gmetric --name='Global JobQueue 
length' --type=int32 --conf=/etc/ganglia/gmond.conf --value=$(mwscript 
getJobQueueLengths.php --totalonly | grep -oE '[0-9]+') > /dev/null 2>&1",
+   command => "/usr/bin/gmetric --name='Global JobQueue 
length' --type=int32 --conf=/etc/ganglia/gmond.conf --value=$(mwscript 
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE 
'[0-9]+') > /dev/null 2>&1",
user => mwdeploy,
ensure => present;
}
@@ -634,8 +634,8 @@
# gather these metrics in a fake host called "www.wikimedia.org"
cron {
all_jobqueue_length_spoofed:
-   command => "/usr/bin/gmetric --name='Global JobQueue 
length' --type=int32 --conf=/etc/ganglia/gmond.conf --spoof 
'www.wikimedia.org:www.wikimedia.org' --value=$(/usr/local/bin/mwscript 
getJobQueueLengths.php --totalonly | grep -oE '[0-9]+') > /dev/null 2>&1",
+   command => "/usr/bin/gmetric --name='Global JobQueue 
length' --type=int32 --conf=/etc/ganglia/gmond.conf --spoof 
'www.wikimedia.org:www.wikimedia.org' --value=$(/usr/local/bin/mwscript 
extensions/WikimediaMaintenance/getJobQueueLengths.php --totalonly | grep -oE 
'[0-9]+') > /dev/null 2>&1",
user => mwdeploy,
ensure => present;
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/57668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f04f8b3b7b39fadf9d55dd7e16b518bbd8a6b47
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WTS: Cleanup/fix emitSeparator code. - change (mediawiki...Parsoid)

2013-04-05 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57763


Change subject: WTS: Cleanup/fix emitSeparator code.
..

WTS: Cleanup/fix emitSeparator code.

* Cleaned up code, improved documentation, and fixed some
  missing cases in that code.
* Greens 1 more wt2wt test.
* Also seems to fix the following snippets which are both
  variations of the same scenario (TODO: Add to parser tests)
  -  x 
  - ''' ''x''' ''

Change-Id: I24c5bce2dc9505ee9ff6f9e38836d63ca228b195
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 66 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/63/57763/1

diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index 19a46df..21e4c83 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2574,81 +2574,89 @@
src = state.env.page.src,
serializeInfo = state.selser.serializeInfo,
constraints = state.sep.constraints,
-   prevNode = state.sep.lastSourceNode;
+   prevNode = state.sep.lastSourceNode,
+   dsrA, dsrB;
 
if (src && !state.selser.serializeInfo && node && prevNode) {
-   // FIXME: Maybe we shouldn't set dsr in the dsr pass if both 
aren't valid?
-   //
-   // When we are in the lastChild sep scenario and the parent 
doesn't have
-   // useable dsr, if possible, walk up the ancestor nodes till we 
find a dsr-bearing node
-   if (prevNode.parentNode === node) {
-   while (!node.nextSibling && node.nodeName !== 'BODY' &&
-   (!node.data ||
-   !node.data.parsoid.dsr ||
-   node.data.parsoid.dsr[0] === null ||
-   node.data.parsoid.dsr[1] === null))
-   {
-   node = node.parentNode;
-   }
-   }
-
-   if (node && node.nodeType === node.TEXT_NODE) {
-   // Check if this is the first child of a zero-width 
element, and use
-   // that for dsr purposes instead. Typical case: text in 
p.
-   if (!node.previousSibling &&
-   node.parentNode &&
-   node.parentNode !== prevNode &&
-   node.parentNode.data.parsoid.dsr &&
-   node.parentNode.data.parsoid.dsr[2] === 
0)
-   {
-   node = node.parentNode;
-   }
-   }
-
-   if (prevNode && prevNode.nodeType === prevNode.TEXT_NODE) {
+   if (prevNode && !DU.isElt(prevNode)) {
// Check if this is the last child of a zero-width 
element, and use
// that for dsr purposes instead. Typical case: text in 
p.
if (!prevNode.nextSibling &&
-   prevNode.parentNode &&
-   prevNode.parentNode !== node &&
-   prevNode.parentNode.data.parsoid.dsr &&
-   prevNode.parentNode.data.parsoid.dsr[3] 
=== 0)
+   prevNode.parentNode &&
+   prevNode.parentNode !== node &&
+   prevNode.parentNode.data.parsoid.dsr &&
+   prevNode.parentNode.data.parsoid.dsr[3] === 0)
{
-   prevNode = prevNode.parentNode;
+   dsrA = prevNode.parentNode.data.parsoid.dsr;
} else if (prevNode.previousSibling &&
prevNode.previousSibling.nodeType === 
prevNode.ELEMENT_NODE &&

prevNode.previousSibling.data.parsoid.dsr)
{
-   //console.log('faking prevNode');
-   var prevSiblingEndDSR = 
prevNode.previousSibling.data.parsoid.dsr[1];
-   // create fake node
-   prevNode = {
-   nodeName: '#fakeelement',
-   nodeType: prevNode.ELEMENT_NODE,
-   data: {
-   parsoid: {
-   dsr: [
-   
prevSiblingEndDSR,
-   
pre

[MediaWiki-commits] [Gerrit] alt ip for mirror at your.org for dump rsync - change (operations/puppet)

2013-04-05 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57764


Change subject: alt ip for mirror at your.org for dump rsync
..

alt ip for mirror at your.org for dump rsync

Change-Id: Ibee5c040823374fc18bcbbd83fb1b3644c74f787
---
M files/rsync/rsyncd.conf.downloadmirror
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/57764/1

diff --git a/files/rsync/rsyncd.conf.downloadmirror 
b/files/rsync/rsyncd.conf.downloadmirror
index 63de4a5..bc8cffe 100644
--- a/files/rsync/rsyncd.conf.downloadmirror
+++ b/files/rsync/rsyncd.conf.downloadmirror
@@ -42,5 +42,4 @@
 # added amazonaws.com, Oct 31 2012 -- atg
 # we are still in the process of setting it up, for access see file in 
/home/w/docs/mirrors
 # it will eventually be managed by folks at amazon
-hosts allow = 199.47.196.26 ftpmirror.your.org 
ec2-174-129-186-231.compute-1.amazonaws.com
-
+hosts allow = 199.47.196.26 ftpmirror.your.org 
ec2-174-129-186-231.compute-1.amazonaws.com 69.31.98.2

-- 
To view, visit https://gerrit.wikimedia.org/r/57764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibee5c040823374fc18bcbbd83fb1b3644c74f787
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] alt ip for mirror at your.org for dump rsync - change (operations/puppet)

2013-04-05 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: alt ip for mirror at your.org for dump rsync
..


alt ip for mirror at your.org for dump rsync

Change-Id: Ibee5c040823374fc18bcbbd83fb1b3644c74f787
---
M files/rsync/rsyncd.conf.downloadmirror
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/rsync/rsyncd.conf.downloadmirror 
b/files/rsync/rsyncd.conf.downloadmirror
index 63de4a5..bc8cffe 100644
--- a/files/rsync/rsyncd.conf.downloadmirror
+++ b/files/rsync/rsyncd.conf.downloadmirror
@@ -42,5 +42,4 @@
 # added amazonaws.com, Oct 31 2012 -- atg
 # we are still in the process of setting it up, for access see file in 
/home/w/docs/mirrors
 # it will eventually be managed by folks at amazon
-hosts allow = 199.47.196.26 ftpmirror.your.org 
ec2-174-129-186-231.compute-1.amazonaws.com
-
+hosts allow = 199.47.196.26 ftpmirror.your.org 
ec2-174-129-186-231.compute-1.amazonaws.com 69.31.98.2

-- 
To view, visit https://gerrit.wikimedia.org/r/57764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibee5c040823374fc18bcbbd83fb1b3644c74f787
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] converting db1021 to mariadb, adding db1058 to s1 for testin... - change (operations/puppet)

2013-04-05 Thread Asher (Code Review)

Asher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57765


Change subject: converting db1021 to mariadb, adding db1058 to s1 for testing 
only
..

converting db1021 to mariadb, adding db1058 to s1 for testing only

Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/57765/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6cadfc1..eece947 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -519,8 +519,8 @@
 }
 
 # eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
-   if $hostname =~ /^db10(01|17)/ {
+node /^db10(01|17|42|43|49|50|51|52|56|58)\.eqiad\.wmnet/ {
+   if $hostname =~ /^db10(01|17|56)/ {
$ganglia_aggregator = "true"
include mha::manager
}
@@ -563,7 +563,7 @@
$ganglia_aggregator = "true"
}
 
-   if $hostname == "db1026" {
+   } elsif $hostname =~ /^db10(21|26)/ {
class { role::coredb::s5 : mariadb => true }
} else {
include role::coredb::s5

-- 
To view, visit https://gerrit.wikimedia.org/r/57765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Initial code upload, WIP - change (operations...libvmod-netmapper)

2013-04-05 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Initial code upload, WIP
..


Initial code upload, WIP

Change-Id: I67cbaf13366700762506e272839e2287a8024d94
---
A .gitignore
A COPYING
A LICENSE
A Makefile.am
A README.rst
A acaux/.gitignore
A autogen.sh
A configure.ac
A m4/.gitignore
A src/.gitignore
A src/Makefile.am
A src/tests/test01.vtc
A src/vmod_netmapper.c
A src/vmod_netmapper.vcc
14 files changed, 568 insertions(+), 0 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..748ee22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+# Autotools junk at top level
+/autom4te.cache/
+/aclocal.m4
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/libtool
+/stamp-h1
+
+# Various tool outputs in all dirs
+Makefile
+Makefile.in
+.dirstamp
+.deps
+.libs
+*.o
+*.so
+*.lo
+*.la
+*.gcov
+*.trucov
+*.info
+*.gcda
+*.gcno
+*.tmp
+*.log
+*.trs
+*~
+
+# Generated manpages
+*.[0-9]
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..f792696
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,7 @@
+Copyright (c) 2011 Varnish Software AS
+...
+See LICENSE for details.
+
+You're free to use and distribute this under terms in the
+LICENSE. Please add your relevant copyright statements.
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..264d421
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000..d7dcb2b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,21 @@
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src
+
+EXTRA_DIST = README.rst
+
+dist_man_MANS = vmod_netmapper.3
+MAINTAINERCLEANFILES = $(dist_man_MANS)
+
+vmod_netmapper.3: README.rst
+
+%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9:
+if HAVE_RST2MAN
+   ${RST2MAN} $< $@
+else
+   @echo ""
+   @echo "You need rst2man installed to make dist"
+   @echo ""
+   @false
+endif
+
diff --git a/README.rst b/README.rst
new file mode 100644
index 000..ed81b0b
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,100 @@
+=
+libvmod_netmapper
+=
+
+XXX this project was recently copied from vmod_example.  Things like docs
+are not at all up to date with the experimental code!
+
+-
+Varnish module to map an IP address to a string
+-
+
+:Author: Martin Blix Grydeland
+:Date: 2011-05-26
+:Version: 1.0
+:Manual section: 3
+
+SYNOPSIS
+
+
+import netmapper;
+
+DESCRIPTION
+===
+
+Example Varnish vmod demonstrating how to write an out-of-tree Varnish vmod
+for Varnish 3.0 and later.
+
+Implements the traditional Hello World as a vmod.
+
+FUNCTIONS
+=
+
+hello
+-
+
+Prototype
+::
+
+hello(STRING S)
+Return value
+   STRING
+Description
+   Returns "Hello, " prepended to S
+Example
+::
+
+set resp.http.hello = netmapper.hello("World");
+
+INSTALLATION
+
+
+This is an netmapper skeleton for developing out-of-tree Varnish
+vmods available from the 3.0 release. It implements the "Hello, World!" 
+as a vmod callback. Not particularly useful in good hello world 
+tradition,but demonstrates how to get the glue around a vmod working.
+
+The source tree is based on autotools to configure the building, and
+does also have the necessary bits in place to do functional unit tests
+using the varnishtest tool.
+
+Usage::
+
+ ./configure VARNISHSRC=DIR [VMODDIR=DIR]
+
+`VARNISHSRC` is the directory of the Varnish source t

[MediaWiki-commits] [Gerrit] converting db1021 to mariadb, adding db1058 to s1 for testin... - change (operations/puppet)

2013-04-05 Thread Asher (Code Review)

Asher has submitted this change and it was merged.

Change subject: converting db1021 to mariadb, adding db1058 to s1 for testing 
only
..


converting db1021 to mariadb, adding db1058 to s1 for testing only

Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Asher: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 6cadfc1..7e7e718 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -519,8 +519,8 @@
 }
 
 # eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
-   if $hostname =~ /^db10(01|17)/ {
+node /^db10(01|17|42|43|49|50|51|52|56|58)\.eqiad\.wmnet/ {
+   if $hostname =~ /^db10(01|17|56)/ {
$ganglia_aggregator = "true"
include mha::manager
}
@@ -563,7 +563,7 @@
$ganglia_aggregator = "true"
}
 
-   if $hostname == "db1026" {
+   if $hostname =~ /^db10(21|26)/ {
class { role::coredb::s5 : mariadb => true }
} else {
include role::coredb::s5

-- 
To view, visit https://gerrit.wikimedia.org/r/57765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 
Gerrit-Reviewer: Asher 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 >

1 - 100 of 149 matches

Mail list logo