Commit Graph

2721 Commits

Author SHA1 Message Date
3381ba4052 Slack (#1226)
* change slack link
2019-10-15 16:24:25 +01:00
b2b05d82ec Merge pull request #1228 from micheloosterhof/dependency-upgrade-2019-10-15
dependency upgrade Tue Oct 15 16:09:51 BST 2019
2019-10-15 16:24:01 +01:00
07ee9b6597 dependency upgrade Tue Oct 15 16:09:51 BST 2019 2019-10-15 16:09:51 +01:00
1dc46a0aec Merge pull request #1225 from mzfr/playlog
Disallow the usage of -i & -b flag together for playlog
2019-10-15 15:21:35 +02:00
ca5937bebb Disallow the usage of -i & -b flag together for playlog 2019-10-13 11:31:45 +05:30
ca5ba10b6f Merge pull request #1223 from Sea-n/patch-1
Fix rst format
2019-10-11 19:07:46 +02:00
c79ceb525f Fix rst format 2019-10-11 15:54:55 +08:00
7856482128 Merge pull request #1217 from micheloosterhof/brackets
Allow for subshell evaluation (commands between parenthesis)
1.9.7
2019-10-04 14:37:43 +03:00
7d3ddffb8d implement subshell (primitively) 2019-10-03 20:04:02 +03:00
0af419bbb1 add failing test case 2019-10-03 19:48:23 +03:00
0ab11d1e71 new test case for $(echo) 2019-10-03 19:46:47 +03:00
e8d5df06d8 Merge pull request #1214 from micheloosterhof/elk-doc-update
json filter not required when json codec specified
2019-09-20 21:01:28 +01:00
14456112fa json filter not required when json codec specified 2019-09-20 21:00:52 +01:00
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