Commit Graph

327 Commits

Author SHA1 Message Date
dovholuknf 5a04e8fefe Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11 2020-10-20 08:02:06 -04:00
dovholuknf 77983c3b95 forgot to call the update script 2020-10-20 08:01:58 -04:00
ziti-ci 1a5b39100b [ci skip] committing updated version information 2020-10-20 12:01:31 +00:00
dovholuknf d096cda0de update version update information 2020-10-20 07:49:59 -04:00
dovholuknf 925b005ce2 Merge branch 'release-1.2.10' of github.com:openziti/desktop-edge-win into release-1.2.10 2020-10-19 23:13:36 -04:00
dovholuknf 144c074e15 truing all the branches to the pre-release branch 2020-10-19 23:13:28 -04:00
ziti-ci ae27dfc8ca [ci skip] committing updated version information 2020-10-20 03:11:42 +00:00
ziti-ci cc41951071 [ci skip] committing updated version information 2020-10-16 18:43:18 +00:00
dovholuknf 9ac14bdb66 Merge pull request #140 from openziti/issue-129-dns-entry-not-removed
fixes issue #129. didn't remove the dns entry from the map
2020-10-16 14:36:47 -04:00
dovholuknf 3d5fc8e2a2 fixes issue #129. didn't remove the dns entry from the map 2020-10-16 13:36:15 -04:00
ziti-ci 1c4d2acb78 [ci skip] committing updated version information 2020-10-16 17:34:05 +00:00
dovholuknf 9013298e8d Merge branch 'fix-ips-treated-as-dns' of github.com:openziti/desktop-edge-win into fix-ips-treated-as-dns 2020-10-16 13:23:30 -04:00
dovholuknf 2f9a9ee351 comment out all the tun device/map lookups. only one tun ever exists at this time
fix all panics --> log.Panicf

eliminate very similar function calls AddIntercept

fix issue with lookups not considering the port when looking for duplicate definitions

rename DeregisterService to UnregisterService
2020-10-16 13:23:13 -04:00
ziti-ci d13d384e34 [ci skip] committing updated version information 2020-10-16 15:21:21 +00:00
dovholuknf c6a19dd933 change dns timeout to debug not warning
add String function to intercept

fix bug with intercepts all being treated as DNS records
2020-10-16 11:08:35 -04:00
ziti-ci 64f9c3954b [ci skip] committing updated version information 2020-10-16 04:15:19 +00:00
ziti-ci b56b04a02c [ci skip] committing updated version information 2020-10-16 04:06:24 +00:00
dovholuknf 5d5f60b945 closes issue #135 - add ip intercepts 2020-10-15 23:58:18 -04:00
ziti-ci 25399e8af6 [ci skip] committing updated version information 2020-10-15 21:07:30 +00:00
ziti-ci e199b95972 [ci skip] committing updated version information 2020-10-15 20:57:15 +00:00
ziti-ci 23c4046e8d [ci skip] committing updated version information 2020-10-15 17:11:38 +00:00
ziti-ci 0c8544699a [ci skip] committing updated version information 2020-10-14 13:11:15 +00:00
ziti-ci c6183abce5 [ci skip] committing updated version information 2020-10-14 13:04:08 +00:00
ziti-ci 406660a5d4 [ci skip] committing updated version information 2020-10-14 12:56:54 +00:00
dovholuknf 83b63dd059 Merge branch 'release-0.0.30' of github.com:openziti/desktop-edge-win into release-0.0.30 2020-10-14 08:51:00 -04:00
dovholuknf ff45bc12cc update readme to trigger travis. travis checks are not showing on PR? 2020-10-14 08:50:54 -04:00
ziti-ci 4de5588532 [ci skip] committing updated version information 2020-10-14 12:45:46 +00:00
ziti-ci 0c1af3e689 [ci skip] committing updated version information 2020-10-14 12:37:39 +00:00
ziti-ci fbfdf92df9 [ci skip] committing updated version information 2020-10-14 12:18:14 +00:00
ziti-ci 44489de1fe [ci skip] committing updated version information 2020-10-14 12:12:47 +00:00
dovholuknf 8382e76742 changes due to PR review 2020-10-14 08:11:32 -04:00
ziti-ci 3a213b820e Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-14 08:05:39 -04:00
ziti-ci 8424bbb98f Merge branch 'release-0.0.30' into test-git-push 2020-10-14 08:05:26 -04:00
ziti-ci 2bdf890d6a [ci skip] committing updated version information 2020-10-14 03:22:03 +00:00
ziti-ci c15930e50d [ci skip] committing updated version information 2020-10-14 03:06:30 +00:00
ziti-ci 01236dbe99 [ci skip] committing updated version information 2020-10-13 19:04:59 +00:00
ziti-ci 7d500bbd86 try out the fix in a regular build 2020-10-13 14:57:07 -04:00
ziti-ci f72fd6ea2f keep on keepin on 2020-10-13 12:20:32 -04:00
ziti-ci 2aeecacbfa add a -v to ssh 2020-10-13 10:20:32 -04:00
ziti-ci fbca7c3428 use icalcs to strip/add privs (emulating chmod) 2020-10-13 09:02:15 -04:00
ziti-ci 1c56827f4c still trying to appease travis 2020-10-13 08:58:34 -04:00
ziti-ci c3ec526960 add 2>&1 to see if there's any std err missing 2020-10-13 08:49:43 -04:00
ziti-ci e616b00176 move ssh command to the bat file to see if this helps 2020-10-13 08:49:22 -04:00
dovholuknf 9b2a7bf0a0 Merge branch 'test-git-push' of github.com:openziti/desktop-edge-win into test-git-push 2020-10-13 07:56:21 -04:00
dovholuknf d51a632067 change where ziti-ci configure git is 2020-10-13 07:56:16 -04:00
ziti-ci 69b3cf02f6 [skip ci] committing from travis 2020-10-13 07:48:11 -04:00
dovholuknf b49ee6e3e5 one of these permutations should work... 2020-10-12 23:24:48 -04:00
dovholuknf 666b0e5673 remove 2>&1 from git push to see if that unsticks travis... 2020-10-12 23:20:37 -04:00
dovholuknf d505f018fd remove the call to status and try again 2020-10-12 23:07:17 -04:00
dovholuknf d4a8d7fa4b remove invalid commands 2020-10-12 23:03:09 -04:00