From f2c53b64e172b5b4cc3deb5d51e3d4415e5adda6 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Mon, 21 Sep 2015 16:40:45 +0300
Subject: [PATCH 1/3] .travis.yml: enable fast_finish

When fast_finish is True, Travis will inform that the build has failed
when one build fails which is usually desirable instead of waiting for
everything to finish.

However builds that haven't finished yet will continue, this doesn't
stop them or do anything else to them.

`travis lint` passes so,

[CI SKIP]
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d230ee8d..6070b589 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
       global:
           - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
 matrix:
+    fast_finish: true
     exclude:
         - os: osx
           env: BUILD_TYPE=asan

From aa631a5ee7b1608c780ac197ec33c5d8cad463ef Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sat, 19 Sep 2015 09:50:03 +0300
Subject: [PATCH 2/3] perform: add descriptions for commands

Thanks @ChasedSpade

Closes #1100
Closes #1102
---
 modules/perform.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/perform.cpp b/modules/perform.cpp
index 419ee4f6..76968e6d 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -90,13 +90,13 @@ public:
 	MODCONSTRUCTOR(CPerform) {
 		AddHelpCommand();
 		AddCommand("Add",     static_cast<CModCommand::ModCmdFunc>(&CPerform::Add),
-			"<command>");
+			"<command>", "Adds perform command to be sent to the server on connect");
 		AddCommand("Del",     static_cast<CModCommand::ModCmdFunc>(&CPerform::Del),
-			"<number>");
-		AddCommand("List",    static_cast<CModCommand::ModCmdFunc>(&CPerform::List));
-		AddCommand("Execute", static_cast<CModCommand::ModCmdFunc>(&CPerform::Execute));
+			"<number>", "Delete a perform command");
+		AddCommand("List",    static_cast<CModCommand::ModCmdFunc>(&CPerform::List),"", "List the perform commands");
+		AddCommand("Execute", static_cast<CModCommand::ModCmdFunc>(&CPerform::Execute),"", "Send the perform commands to the server now");
 		AddCommand("Swap",    static_cast<CModCommand::ModCmdFunc>(&CPerform::Swap),
-			"<number> <number>");
+			"<number> <number>", "Swap two perform commands");
 	}
 
 	virtual ~CPerform() {}

From 10d92e539b3e922e0194d24750a6be0a2c3f4f34 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Thu, 15 Oct 2015 15:08:52 +0300
Subject: [PATCH 3/3] .travis.yml: use Ubuntu Trusty & #znc-dev

http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/ and
we have been talking forever about moving notifications to #znc-dev and
there have been multiple PRs for that.

-y is apparently needed with trusty or apt hangs forever waiting for
yes/no.
---
 .travis.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6070b589..e84a87df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,9 @@ before_install:
 install:
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cat /proc/cpuinfo /proc/meminfo; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then lsb_release -a; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:teward/swig3.0; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:teward/icu-backports; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libperl-dev python3-dev tcl-dev libsasl2-dev libgtest-dev libicu-dev swig3.0 doxygen graphviz; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get install g++-4.8; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install libperl-dev python3-dev tcl-dev libsasl2-dev libgtest-dev libicu-dev swig3.0 doxygen graphviz; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CFGFLAGS="$CFGFLAGS --with-gtest=/usr/src/gtest"; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sw_vers; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep cpu; fi
@@ -80,6 +76,8 @@ after_success:
 notifications:
     irc:
         channels:
-            - "irc.freenode.net#znc"
+            - "irc.freenode.net#znc-dev"
         on_success: always
         on_failure: always
+sudo: required
+dist: trusty