1
0
mirror of https://github.com/anope/anope.git synced 2026-06-28 21:16:38 +02:00

Merge branch '2.0' into 2.1.

This commit is contained in:
Sadie Powell
2025-06-25 15:33:36 +01:00
14 changed files with 21 additions and 21 deletions
+2 -2
View File
@@ -638,7 +638,7 @@ public:
if (!packet)
return false;
Log(LOG_DEBUG_2) << "Resolver: Notifying slave " << packet->addr.addr();
Log(LOG_DEBUG_2) << "Resolver: Notifying secondary " << packet->addr.addr();
try
{
@@ -939,7 +939,7 @@ public:
void Notify(const Anope::string &zone) override
{
/* notify slaves of the update */
/* notify secondaries of the update */
for (const auto &[ip, port] : notify)
{
sockaddrs addr;
+1 -1
View File
@@ -55,7 +55,7 @@ public:
if (na->HasExt("HELD"))
{
nickserv->Release(na);
source.Reply(_("Service's hold on \002%s\002 has been released."), na->nick.c_str());
source.Reply(_("Services' hold on \002%s\002 has been released."), na->nick.c_str());
}
else if (!u)
{