Commit Graph

145 Commits

Author SHA1 Message Date
53f446e219 Docs update 2017-02-07 12:41:43 +03:00
Denis
e13b74730b Merge pull request #16 from Surkoveds/devel-07022017
Merged
2017-02-07 10:38:32 +02:00
Васильев Евгений Владимирович
62cb5c24ba PEP8 2017-02-07 01:58:13 +03:00
Васильев Евгений Владимирович
1f09875aa3 Update russian docs. Add compatible for version 0.7. Add config module. Fix discovery module. Update test.py 2017-02-07 01:39:30 +03:00
Denis
f8460d301a Merge pull request #15 from VEvgeniyV/marathon-discovery
Add Marathon discovery. Remade discovery and logger module
2017-01-25 12:30:37 +02:00
Васильев Евгений Владимирович
12b868ad0b Add Marathon discovery. Remade discovery and logger module 2017-01-25 13:11:51 +03:00
Denis
d83ed8b752 Merge pull request #13 from Surkoveds/consul
Consul
2017-01-23 15:53:47 +02:00
Denis
0ad579a4b9 Merge branch 'testing' into consul 2017-01-21 10:02:12 +02:00
Denis Zheleztsov
3511f13180 Consul DNS discovery. Related to #12 2017-01-21 10:58:02 +03:00
Denis
fc4e2b1b47 Merge pull request #11 from Surkoveds/debian_package
Debian package docs update
2017-01-19 14:23:10 +02:00
bde94dd1fa docs in debian package 2017-01-19 15:04:49 +03:00
36917da190 link to wiki update 2017-01-18 12:15:02 +03:00
e20811687d comment 2017-01-18 12:02:47 +03:00
Denis
d19a655077 Merge pull request #7 from Surkoveds/readme
Readme
2017-01-18 10:46:25 +02:00
Denis
3468c3b82b Merge branch 'master' into readme 2017-01-18 10:44:06 +02:00
c4b8be682d travis link update 2017-01-18 11:43:01 +03:00
Denis Zheleztsov
19ed189cc3 POC realization of #15 2017-01-18 10:36:58 +03:00
0f9263f288 Merge pull request #13 from Difrex/testing
changelog fix
2017-01-16 10:06:26 +03:00
Denis Zheleztsov
41323c6f43 changelog fix 2017-01-13 17:54:26 +03:00
Denis Zheleztsov
ec9604ffe4 Version bump in packages 2017-01-13 10:21:10 +03:00
Denis Zheleztsov
8dd0fab3d8 toc to md 2017-01-12 13:20:14 +03:00
Denis Zheleztsov
d88cf67dd9 rename index.html 2017-01-12 13:15:23 +03:00
Denis Zheleztsov
b7291450e1 markdown to html 2017-01-12 13:11:01 +03:00
Denis Zheleztsov
d74c36eed1 index.html 2017-01-12 13:05:23 +03:00
Denis Zheleztsov
7744de0348 Merge branch 'master' of github.com:Difrex/surok 2017-01-12 13:02:46 +03:00
Denis Zheleztsov
16a61a3521 github pages toc 2017-01-12 13:02:20 +03:00
Denis
3044003830 Set theme jekyll-theme-minimal 2017-01-12 12:44:28 +03:00
Denis Zheleztsov
5c0d06586a wiki to docs 2017-01-12 12:43:30 +03:00
Denis Zheleztsov
922d670edd docs 2017-01-12 12:42:39 +03:00
1f1dfe3064 Merge branch 'master' of github.com:Difrex/surok 2017-01-11 00:24:20 +03:00
95abf430c8 PEP8 2017-01-11 00:24:14 +03:00
6dc15fda77 Merge pull request #12 from Difrex/fix-issue-11
Alphabetical sort for config files. Fixes #11
2017-01-10 15:42:44 +03:00
w1r0x
912be7c596 Alphabetical sort for config files. Fixes #11 2017-01-10 15:32:33 +03:00
Denis
d63f2a5f3a Merge pull request #10 from w1r0x/feat-memory-leak-fix
change marathon group parsing method
2016-12-06 12:22:39 +03:00
w1r0x
dec5e790c7 change marathon group parsing method
fixes difrex/surok#9
2016-12-06 12:11:01 +03:00
9a439fbecf python2 in centos 2016-11-25 12:10:06 +03:00
Denis Zheleztsov
53e2152bc2 Fix ip in discovery 2016-11-16 15:34:57 +03:00
Denis Zheleztsov
fa7427d993 Server IPs added 2016-11-16 14:51:57 +03:00
Denis Zheleztsov
5cd3f7c9b8 closes #5 2016-11-16 10:08:39 +03:00
Denis Zheleztsov
ed2fffefeb Readme update 2016-11-15 11:02:42 +03:00
Denis Zheleztsov
b8e6df3d33 Readme update 2016-11-15 11:01:18 +03:00
Denis Zheleztsov
782423fd53 rpm for CentOS build. Initial 2016-11-14 17:28:35 +03:00
Denis Zheleztsov
3f161d14ed tests progress 2016-11-14 15:59:39 +03:00
Denis Zheleztsov
6422a2663c fix tests 2016-11-14 15:04:16 +03:00
Denis Zheleztsov
c62a38eb7f logger test and fix debian/install 2016-11-14 14:57:17 +03:00
Denis Zheleztsov
1fdefce3dc Fix travis script 2016-11-12 13:31:21 +03:00
Denis Zheleztsov
1cc4f3cc2b travis update 2016-11-12 13:25:19 +03:00
Denis Zheleztsov
83d1b32ebb Unttests initial 2016-11-12 13:22:23 +03:00
Denis Zheleztsov
f85ce43708 pip requirements 2016-11-12 12:55:18 +03:00
Denis Zheleztsov
eb75f69723 Readme update 2016-11-11 21:50:05 +03:00