Commit Graph

2558 Commits

Author SHA1 Message Date
225e618341 Merge pull request #1208 from micheloosterhof/pypy-travis
fix travis
2019-09-12 23:11:15 +04:00
bb225f52ec Update .travis.yml 2019-09-12 22:52:50 +04:00
53106f8773 Merge pull request #1211 from micheloosterhof/apt
better argument parsing
2019-09-12 22:50:48 +04:00
6c56142f6f Merge pull request #1210 from micheloosterhof/dd-blocksize
allow more
2019-09-12 22:50:33 +04:00
7532d14dcc better argument parsing 2019-09-12 22:41:24 +04:00
0fd1dcd890 allow more 2019-09-12 22:36:52 +04:00
9ff76cd3eb Memory leak (#1209)
* remove `running` variable
2019-09-12 16:28:29 +01:00
1555840c20 remove devbug code 2019-09-12 19:27:35 +04:00
f56fff3803 remove running variable 2019-09-12 19:25:50 +04:00
90a0a2ade8 pypy not working 2019-09-12 15:54:44 +04:00
7075d465d8 try without apt-get update 2019-09-12 15:45:26 +04:00
4a0577b471 grr 2019-09-12 15:38:08 +04:00
c19af6623a give up 2019-09-12 15:34:35 +04:00
c938c34a7f try different way 2019-09-12 15:27:51 +04:00
d98eb358e6 Merge branch 'pypy-travis' of https://github.com/micheloosterhof/cowrie-dev into pypy-travis 2019-09-12 15:22:00 +04:00
1ad7bacb05 change option order 2019-09-12 15:21:42 +04:00
65d60d7a9f Merge branch 'master' into pypy-travis 2019-09-12 12:14:34 +01:00
826cddd2cd xenial -> bionic 2019-09-12 15:10:19 +04:00
a01dcd0a7d remove debug line 2019-09-12 12:34:27 +04:00
f330711691 usage 2019-09-12 12:15:17 +04:00
f95d4a6fcb grr 2019-09-12 12:08:40 +04:00
759c6d8210 optimize test 2019-09-12 12:07:36 +04:00
d824bbf7cf remove recommended apt packages 2019-09-12 12:06:39 +04:00
a47cafa2f9 test output 2019-09-12 12:03:08 +04:00
6611094613 2.8->3.8 2019-09-12 11:55:48 +04:00
b76ac0dbe1 circle 2019-09-12 11:53:24 +04:00
1f564c3803 more py versions (#1206)
* py versions
* allow failure for nightly/dev
2019-09-12 08:22:55 +01:00
a33e67fa84 allow failure for nightly/dev 2019-09-12 11:12:46 +04:00
32abedba18 py versions 2019-09-12 11:08:35 +04:00
8526d5d18d more py versions` 2019-09-12 11:01:05 +04:00
5ce37fbf35 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-11 22:13:05 +04:00
126d3b34f1 Mysql retry (#1205)
* log message was on wrong branch
2019-09-09 22:22:44 +01:00
b44b907743 remove exceptions (#1204) 2019-09-06 16:52:35 +01:00
60bcf2b0e1 better error (#1203) 2019-09-06 16:39:49 +01:00
cec5ba4c34 Dock (#1202)
* instead use dockerfile in docker-cowrie/ remove this to stop confusion
2019-09-06 15:42:18 +01:00
41077d3664 Crash defaults (#1201)
* change defaults on crash reporter
2019-09-06 15:12:52 +01:00
ca837eda04 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-06 15:05:49 +01:00
5db18ff97a Crash (#1200)
* fix
2019-09-06 14:45:18 +01:00
e60cb7088f Crash (#1199)
* update crashreporter
2019-09-06 14:13:20 +01:00
38d7d95d84 Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-06 14:02:51 +01:00
69ced5431f Add retro-compatibility for Python 2.7 (#1198)
* add retro-compatibility for Python 2.7
2019-09-05 07:49:50 +01:00
a0e1e1251b Tftp exception (#1197)
* remove tftp exceptions
2019-09-04 22:31:27 +01:00
ca1213b4a8 treq as requirement (#1196) 2019-09-04 22:22:49 +01:00
07b25db3dd Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-04 22:18:26 +01:00
5e2eff567d add __init__ for py2 (#1195) 2019-09-04 16:02:28 +01:00
7a48eda9ec Telemetry (#1194)
* crashreporter uploads crashes to api.cowrie.org
2019-09-04 16:01:48 +01:00
b35b98666d Merge branch 'master' of https://github.com/cowrie/cowrie 2019-09-02 08:14:45 +01:00
58fcb470be Py3 hpfeeds (#1192)
* __next__ for py3
2019-08-30 13:01:29 +04:00
27befe953d Merge branch 'master' of https://github.com/cowrie/cowrie 2019-08-30 12:37:43 +04:00
d4d6453209 Use interactive_timeout in SSH proxy (#1190) 2019-08-27 21:52:35 +01:00