valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,416 Commits 24 Branches 182 Tags 341 MiB
26fee96834
Commit Graph

48416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
26fee96834 Merge branch 'committerparser' of https://github.com/cro/salt into cro-committerparser 2015-03-10 10:10:28 -06:00
Pedro Algarvio
821169b0e8 Merge pull request #21486 from rallytime/pylint 
Pylint 3 compatability fix for payload.py
 2015-03-10 16:04:18 +00:00
Nicole Thomas
827541ef3a Merge pull request #21469 from vdesjardins/develop 
fixes #20198: virt.get_graphics and virt.get_nics calls in module virt
 2015-03-10 09:16:49 -06:00
rallytime
4370bd4faf Pylint 3 compatability fix for payload.py 2015-03-10 08:58:37 -06:00
Seth House
6aa498947a Removed SaltConf banner 2015-03-10 09:05:06 -04:00
Vincent Desjardins
40418eaf17 fix pylint error in virt module. 2015-03-10 07:22:29 -04:00
jfindlay
1903d4b13b Merge pull request #21471 from jayeshka/znc-unit-test 
adding znc unit test
 2015-03-10 03:34:03 -06:00
Jayesh Kariya
625b3f48f0 adding znc unit test 2015-03-10 10:36:10 +05:30
Vincent Desjardins
7e517a6a5a fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-09 22:10:38 -04:00
Thomas S Hatch
e4daafc345 Merge pull request #21459 from jfindlay/fix_at 
de-cruft at.at command setup
 2015-03-09 19:06:43 -06:00
Mike Place
4e1c77727b Merge pull request #21466 from cachedout/syslog_lint 
Lint syslog returner
 2015-03-09 18:19:35 -06:00
Mike Place
757effe3ad Lint syslog returner 2015-03-09 18:53:43 -06:00
Mike Place
af074ac6f0 Merge pull request #21334 from tbaker57/issue_21060 
Documentation update. Resolves issue #21060
 2015-03-09 18:17:32 -06:00
Mike Place
3ead144b52 Merge pull request #21464 from cachedout/one_liner 
Change bootstrap instructions to two liner
 2015-03-09 17:51:03 -06:00
Mike Place
56bac362fd Change bootstrap instructions to two liner 2015-03-09 18:24:53 -06:00
C. R. Oldham
f587330576 Moar Python3 compatibility. 2015-03-09 17:16:47 -06:00
C. R. Oldham
ea70e82edf Add statistics by committer by month, from future import 2015-03-09 17:00:56 -06:00
Justin Findlay
e9e7d0629f simplify at.at command setup 2015-03-09 16:59:45 -06:00
jfindlay
8ff95ac138 Merge pull request #21443 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-09 16:55:25 -06:00
Colton Myers
31c1d07afe Merge pull request #7 from jfindlay/merge 
fix test lint
 2015-03-09 16:03:25 -06:00
Justin Findlay
7a49e3e877 fix test lint 2015-03-09 16:00:10 -06:00
jfindlay
fba2284161 Merge pull request #21447 from thatch45/beacon_doc 
MOAR beacons docs
 2015-03-09 15:58:26 -06:00
C. R. Oldham
b95e5cd706 Add simple parser to return some activity numbers from our git log. 2015-03-09 15:57:30 -06:00
Colton Myers
b53eecea0a Merge pull request #6 from jfindlay/merge 
fix iptables tests
 2015-03-09 15:22:04 -06:00
Justin Findlay
2c04a36efa fix iptables tests 2015-03-09 15:09:55 -06:00
Thomas S Hatch
14981bf748 Merge pull request #21428 from techhat/azureop 
Add get_operation_status() to Azure driver
 2015-03-09 14:53:25 -06:00
Thomas S Hatch
dc691ae3f4 Add return data example 2015-03-09 14:33:12 -06:00
Thomas S Hatch
ffdce765e2 Merge pull request #21433 from rallytime/pylint_fixes 
Latest Python 3 compat fixes, plus a versionadded tag
 2015-03-09 14:28:30 -06:00
Thomas S Hatch
b514da6e13 Merge pull request #21445 from rallytime/fix_21442 
Remove .rst from doc link
 2015-03-09 14:16:59 -06:00
Thomas S Hatch
bf201865d0 MOAR beacons docs 2015-03-09 14:10:06 -06:00
Joseph Hall
66c075d656 Linting 2015-03-09 13:45:15 -06:00
rallytime
b87ac90469 It's incompatible-py3-code 2015-03-09 13:40:37 -06:00
Thomas S Hatch
fa63b57076 Merge pull request #21436 from sjwoodr/21434_ec2-non-standard-ssh-port 
21434: Support EC2 provider with non-standard ssh port
 2015-03-09 13:27:40 -06:00
rallytime
a71aa68415 Remove .rst from doc link 
Fixes #21442
 2015-03-09 12:58:07 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
rallytime
1cd73e8069 Better pylint disable 2015-03-09 12:49:32 -06:00
Thomas S Hatch
5fee4a2d10 Merge pull request #21426 from techhat/ec2console 
Remove return_url from get_console_output
 2015-03-09 11:50:57 -06:00
Steve Woodruff
8a274d6faa 21434: Support EC2 provider with non-standard ssh port 2015-03-09 12:44:20 -05:00
rallytime
3620e4ea86 Latest Python 3 compat fixes, plus a versionadded tag 2015-03-09 11:31:52 -06:00
Thomas S Hatch
2aeb82b540 Merge pull request #21279 from minusf/issue_21241 
change to $HOME during startup (#21241)
 2015-03-09 11:16:08 -06:00
Thomas S Hatch
558f5e4d81 Merge pull request #21363 from lorengordon/file-replace-rework 
[QUESTION] Rework `file.replace` to remove `fileinput`
 2015-03-09 11:11:15 -06:00
Thomas S Hatch
268ee22d92 Merge pull request #21314 from arthurlogilab/postgresql 
[modules/postgresql] modules for cluster management in postgresql (debian specific)
 2015-03-09 11:09:56 -06:00
Thomas S Hatch
a247ed7425 Merge pull request #21430 from thatch45/VynceMontgomery-develop 
Merge #21400
 2015-03-09 11:08:07 -06:00
Thomas S Hatch
ecacdcbe75 Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop 2015-03-09 11:07:14 -06:00
Thomas S Hatch
0852db0b8e Merge pull request #21429 from thatch45/junckritter-cloud-gce-tests 
Merge #21421
 2015-03-09 11:03:28 -06:00
Thomas S Hatch
0da8878b90 lint 2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4 Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests 2015-03-09 11:00:10 -06:00
David Boucha
4813a2ed70 Merge pull request #21188 from freimer/issue_21187 
Add return code for status=2, hard-quote password
 2015-03-09 10:58:16 -06:00
Thomas S Hatch
ccff99590e Merge pull request #21424 from robin-wittler/develop 
fix wrong mode handling in get_proc_dir and utils.fpopen
 2015-03-09 10:54:27 -06:00
Joseph Hall
1e2ebc77f9 Add get_operation_status() to Azure driver 2015-03-09 10:53:01 -06:00