Commit e7dd00fc authored by karel010's avatar karel010 Committed by helmo

Issue #2757765 by karel010: Incompatible overrides in pack and cluster module

parent fa085659
......@@ -37,11 +37,11 @@ class Provision_Service_http_cluster extends Provision_Service_http {
$this->_each_server(__FUNCTION__);
}
function create_config($config) {
function create_config($config, $data = array()) {
$this->_each_server(__FUNCTION__, array($config));
}
function delete_config($config) {
function delete_config($config, $data = array()) {
$this->_each_server(__FUNCTION__, array($config));
return $this;
......@@ -61,12 +61,12 @@ class Provision_Service_http_cluster extends Provision_Service_http {
return $this->_each_server(__FUNCTION__);
}
function sync() {
function sync($path = NULL, $additional_options = array()) {
$args = func_get_args();
$this->_each_server(__FUNCTION__, $args);
}
function fetch() {
function fetch($path = NULL) {
drush_log('Skipping fetch from remote server(s), since master is authoritative in cluster service.');
}
......
......@@ -59,12 +59,12 @@ class Provision_Service_http_pack extends Provision_Service_http {
$this->_each_server($this->server->slave_web_servers, __FUNCTION__);
}
function create_config($config) {
function create_config($config, $data = array()) {
$this->_each_server($this->server->master_web_servers, __FUNCTION__, array($config));
$this->_each_server($this->server->slave_web_servers, __FUNCTION__, array($config));
}
function delete_config($config) {
function delete_config($configi, $data = array()) {
$this->_each_server($this->server->master_web_servers, __FUNCTION__, array($config));
$this->_each_server($this->server->slave_web_servers, __FUNCTION__, array($config));
......@@ -87,12 +87,12 @@ class Provision_Service_http_pack extends Provision_Service_http {
$this->_each_server($this->server->slave_web_servers, __FUNCTION__);
}
function sync() {
function sync($path = NULL, $additional_options = array()) {
$args = func_get_args();
$this->_each_server($this->server->master_web_servers, __FUNCTION__, $args);
}
function fetch() {
function fetch($path = NULL) {
$args = func_get_args();
$this->_each_server($this->server->master_web_servers, __FUNCTION__, $args);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment