aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-11-24 09:29:26 +0100
committerWladimir J. van der Laan <[email protected]>2015-11-24 09:29:46 +0100
commited34e0577e8d897a2c9ee2f30df9e3a762a8ba5a (patch)
treea00fd689b26503e7a00976515b9191d9377c7540
parentMerge pull request #7065 (diff)
parent[qa] python-bitcoinrpc is no longer a subtree (diff)
downloaddiscoin-ed34e0577e8d897a2c9ee2f30df9e3a762a8ba5a.tar.xz
discoin-ed34e0577e8d897a2c9ee2f30df9e3a762a8ba5a.zip
Merge pull request #7052
a0953cd [qa] python-bitcoinrpc is no longer a subtree (MarcoFalke)
-rw-r--r--qa/rpc-tests/README.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md
index e8d77f7ef..898931936 100644
--- a/qa/rpc-tests/README.md
+++ b/qa/rpc-tests/README.md
@@ -1,10 +1,8 @@
Regression tests
================
-### [python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc)
-Git subtree of [https://github.com/jgarzik/python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc).
-Changes to python-bitcoinrpc should be made upstream, and then
-pulled here using git subtree.
+### [test_framework/authproxy.py](test_framework/authproxy.py)
+Taken from the [python-bitcoinrpc repository](https://github.com/jgarzik/python-bitcoinrpc).
### [test_framework/test_framework.py](test_framework/test_framework.py)
Base class for new regression tests.