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
49,310 Commits 24 Branches 182 Tags 341 MiB
7bfa4ce70d
Commit Graph

49310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
7bfa4ce70d Disable unused-import for py 3 compatibility 2015-03-23 10:47:03 -06:00
rallytime
e5e287cbb4 Pythong 3 compat fix for pylint 2015-03-23 10:03:56 -06:00
jfindlay
78640b337e Merge pull request #21891 from gotcha/patch-2 
Specify valid values for gitfs_provider option
 2015-03-23 09:08:01 -06:00
Godefroid Chapelle
ffe267a741 Specify valid values for gitfs_provider option 2015-03-23 15:33:10 +01:00
jfindlay
dabc336faa Merge pull request #21889 from jayeshka/random_org-unit-test 
adding random_org unit test
 2015-03-23 08:21:49 -06:00
Jayesh Kariya
d27ab5c304 adding random_org unit test 2015-03-23 11:18:43 +05:30
jfindlay
adc99777a6 Merge pull request #21885 from mattwillsher/patch-1 
Remove check for physical virt type for salt.modules.virt.is_kvm_hyper()
 2015-03-22 22:05:57 -06:00
Matt Willsher
f9300a3cbc Remove check for physical virt type for KVM 
KVM can run in VMs when VT-x is passed through the VM, as can be done on VMWare Fusion, and Workstation, perhaps even KVM itself.
 2015-03-22 19:43:09 +00:00
jfindlay
489e3d3c73 Merge pull request #21882 from eliasp/fix-reg.absent-code-block 
Added missing 'code-block' statement for 'reg.absent' example.
 2015-03-22 12:39:08 -06:00
jfindlay
73fd3eb32b Merge pull request #21880 from bechtoldt/issue/21879 
update references, fixes #21879
 2015-03-22 12:38:27 -06:00
jfindlay
b02c1a20c4 Merge pull request #21874 from bvtreyperry/lazy-itable-init 
Add support for explicit lazy inode table initialization when creating ext* file systems
 2015-03-22 12:29:31 -06:00
Elias Probst
8d82b2a8f6 Added missing 'code-block' statement for 'reg.absent' example. 2015-03-22 15:24:51 +01:00
Trey Perry
53be98db54 Adding in the missing trailing newline character 2015-03-22 08:25:34 -05:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01:00
Trey Perry
30014ce329 Add support for lazy inode table initialization for ext* file systems 2015-03-21 20:53:03 -05:00
Colton Myers
1ef636cf14 Merge pull request #21868 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-21 16:08:13 -06:00
Colton Myers
3c5f9af2d4 Lint (blank lines) 2015-03-21 15:36:04 -06:00
Colton Myers
9f3837f2b6 Remove duplicate modified function 2015-03-21 15:35:21 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
 2015-03-20 20:09:19 -06:00
Thomas S Hatch
9bc056d230 Merge pull request #21865 from twangboy/boto 
Fix adding a user from state file
 2015-03-20 16:24:48 -06:00
Colton Myers
1068dd8f66 Merge pull request #21866 from basepi/fixthethings 
fix the things.
 2015-03-20 15:47:34 -06:00
Colton Myers
13c0ea2a73 fix the things. 2015-03-20 15:46:10 -06:00
jfindlay
665cb94307 Merge pull request #21862 from jfindlay/keystone 
adding keystone unit test
 2015-03-20 15:39:32 -06:00
twangboy
ff62965656 Added missing function parameter 2015-03-20 15:30:51 -06:00
twangboy
4ef2df9b49 Catch OSError as well 2015-03-20 15:29:42 -06:00
twangboy
889d35e802 Fixed Six Import error 2015-03-20 15:28:45 -06:00
jfindlay
1ea3f262a7 Merge pull request #21859 from rallytime/versionadded 
Added versionadded tags to some new functions and cleaned up """
 2015-03-20 14:41:35 -06:00
Colton Myers
9282d9beac Merge pull request #21829 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-03-20 14:41:29 -06:00
Justin Findlay
d838474cce add mock of keystoneclient module 2015-03-20 14:39:24 -06:00
Colton Myers
9b8f6085d2 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/BuildSalt.bat
    pkg/windows/installer/Salt-Minion-Setup.nsi
 2015-03-20 14:39:22 -06:00
Shane Lee
af01dc7ca5 Merge pull request #21861 from twangboy/build 
Final (hopefully) improvements to the new build structure
 2015-03-20 13:19:32 -07:00
Shane Lee
febef7eb78 Update salt-cp.bat 2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c Added batchfiles to mimick the behavior of the exe's 2015-03-20 14:12:48 -06:00
twangboy
81025d8388 Fixed version parameter 2015-03-20 13:50:56 -06:00
twangboy
db64bef89c Updated BuildSalt and Salt-Minion-Setup.nsi 
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
 2015-03-20 13:48:08 -06:00
Shane Lee
86037bbc4c Merge pull request #21854 from jfindlay/bp-21791 
backport #21791 to 2014.7
 2015-03-20 12:44:24 -07:00
Colton Myers
270027ff8d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/mine.py
 2015-03-20 13:34:30 -06:00
Thomas S Hatch
9da5b3342b Merge pull request #21857 from jfindlay/bp-21844 
backport #21844 to 2014.7
 2015-03-20 13:22:59 -06:00
Thomas S Hatch
3c7ede755e Merge pull request #21839 from terminalmage/fix-yumpkg-download 
Modifications to salt.modules.yumpkg.download
 2015-03-20 13:22:43 -06:00
rallytime
14b6622893 Added versionadded tags to some new functions and cleaned up """ 2015-03-20 13:21:41 -06:00
twangboy
fbec10071a Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat 2015-03-20 13:19:44 -06:00
twangboy
98944e9842 Added file to slim the windows install 2015-03-20 13:18:37 -06:00
Nicole Thomas
d492453173 Merge pull request #21843 from isbm/isbm-rpm-modified-files-to-2015.2-1 
Backport #21736 to 2015.2
 2015-03-20 13:18:15 -06:00
Nicole Thomas
54b32db78d Merge pull request #21855 from rallytime/bp-21841 
Backport #21841 to 2014.7
 2015-03-20 13:15:33 -06:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Nicole Thomas
c3c108d4b7 Merge pull request #21851 from rallytime/bp-20781 
Backport the fix in #20781 manually to the 2014.7 branch
 2015-03-20 12:56:31 -06:00
Nicole Thomas
ca33da7082 Merge pull request #21852 from jfindlay/bp-21790 
backport #21790 to 2014.7
 2015-03-20 12:35:31 -06:00
Thomas S Hatch
c3e2a1389c Merge pull request #21836 from ticosax/docker-running-old-image 
improve detection of changes of docker.running
 2015-03-20 12:30:01 -06:00
David Murphy
80c5532095 Merge pull request #21856 from rallytime/versionadded_tags 
Add versionadded tags to new functions in runners/manage.py
 2015-03-20 12:26:21 -06:00
Johan van den Dorpe
4fe795f66c Always check other OS release files if lsb_distrib_id grain not populated from /etc/lsb-release 
Fixes #19953
 2015-03-20 12:21:32 -06:00