From 411b05ac9511395923976bfbd0c153ddabf2ebcf Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 8 Oct 2015 09:58:31 +0200
Subject: Refactor parameter interaction, call it before AppInit2()

---
 src/bitcoind.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index addf0e6a2..f1875731d 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -151,6 +151,7 @@ bool AppInit(int argc, char* argv[])
 #endif
         SoftSetBoolArg("-server", true);
 
+        InitParameterInteraction();
         fRet = AppInit2(threadGroup, scheduler);
     }
     catch (const std::exception& e) {
-- 
cgit v1.2.3


From a46f87f0c17323d8853d95f8ea99f8fb0f3bda1a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 26 Nov 2015 14:03:27 +0100
Subject: Initialize logging before we do parameter interaction

---
 src/bitcoind.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index f1875731d..4cee2d3cf 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -151,6 +151,8 @@ bool AppInit(int argc, char* argv[])
 #endif
         SoftSetBoolArg("-server", true);
 
+        // Set this early so that parameter interactions go to console
+        InitLogging();
         InitParameterInteraction();
         fRet = AppInit2(threadGroup, scheduler);
     }
-- 
cgit v1.2.3


From fa24439ff3d8ab5b9efaf66ef4dae6713b88cb35 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sun, 13 Dec 2015 17:58:29 +0100
Subject: Bump copyright headers to 2015

---
 src/bitcoind.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 4cee2d3cf..3b6608c95 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin Core developers
+// Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-- 
cgit v1.2.3


From a0eaff8a1d18ebba33cdea4cd1efaddeb55519e7 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Fri, 15 Jan 2016 11:55:17 +1100
Subject: move rpc* to rpc/

---
 src/bitcoind.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 3b6608c95..d1fd56d17 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -5,14 +5,13 @@
 
 #include "chainparams.h"
 #include "clientversion.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "init.h"
 #include "noui.h"
 #include "scheduler.h"
 #include "util.h"
 #include "httpserver.h"
 #include "httprpc.h"
-#include "rpcserver.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
-- 
cgit v1.2.3