valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,275 Commits 24 Branches 182 Tags 341 MiB
c53e41fdec
Commit Graph

57275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
c53e41fdec Remove unnecessary warnings from log 2015-08-28 23:11:34 -05:00
Erik Johnson
75a51cbceb Remove redundant function for retrieving git version 2015-08-28 23:03:08 -05:00
Erik Johnson
52d354a7db Use --track to set tracking branch on older git versions 2015-08-28 22:54:25 -05:00
Erik Johnson
9655e83e7e No need to support alternate user to run git --version 2015-08-28 22:54:00 -05:00
Colton Myers
203cf7a55e Merge pull request #26765 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-28 19:28:33 -06:00
Colton Myers
3b696d97b3 Fix lint 2015-08-28 17:39:41 -06:00
Joseph Hall
eb82c89371 Merge pull request #26761 from sjorge/spm-esky 
fix SPM paths on smartos/illumos esky
 2015-08-28 16:42:18 -06:00
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
David Boucha
59d06ce049 Merge pull request #26751 from terminalmage/fix-masterless-winrepo 
Fixes for masterless winrepo
 2015-08-28 16:45:08 -05:00
Jorge Schrauwen
9efef940c1 fix SPM paths on smartos/illumos esky 2015-08-28 21:42:44 +00:00
Joseph Hall
21458ac732 Merge pull request #26745 from rallytime/pyrax_fixes 
Make sure pyrax configs are in place before checking for deps
 2015-08-28 15:35:06 -06:00
Joseph Hall
3f7cc8318e Merge pull request #26746 from rallytime/nova_configs_fix 
Make sure nova configs are set before checking for dependencies
 2015-08-28 15:34:58 -06:00
Colton Myers
49e1de81cd Merge pull request #26750 from basepi/state.dunder.utils 
[2015.8] Add __utils__ to state modules
 2015-08-28 15:01:14 -06:00
Pedro Algarvio
7a58878ea8 Merge pull request #26753 from jfindlay/iloet 
import elementree from _compat in ilo exec mod
 2015-08-28 21:56:44 +01:00
Erik Johnson
c47e46fa46 Add some default values for masterless winrepo 
These should make it work with gitpython/pygit2
 2015-08-28 15:20:21 -05:00
Justin Findlay
0fd1038f47 Merge pull request #26752 from cro/diagram_typo 
Fix typo in some diagram labels
 2015-08-28 13:59:34 -06:00
Erik Johnson
684591131c Fix lint error 
This isn't really unused, it's required by the imported functions.
 2015-08-28 14:56:12 -05:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Justin Findlay
211a02754f import elementree from _compat in ilo exec mod 
Fixes #26732.
 2015-08-28 13:03:31 -06:00
C. R. Oldham
65ae57310c Fix typo in some draw object labels 2015-08-28 12:49:16 -06:00
Erik Johnson
a3b7668256 Import PER_REMOTE_PARAMS from winrepo runner 2015-08-28 13:40:05 -05:00
Colton Myers
51b1c6b106 Use existing utils lazyloader wherever possible 2015-08-28 12:36:12 -06:00
Erik Johnson
791c2dac94 Default to HEAD for remote revision in masterless winrepo 2015-08-28 13:28:26 -05:00
Erik Johnson
d165c9cb31 Don't permit rev to be None or any other False value 2015-08-28 13:28:00 -05:00
Colton Myers
6e8ddf9dc5 Add __utils__ to state modules 2015-08-28 12:24:18 -06:00
Colton Myers
6ff38ac0da Merge pull request #26747 from basepi/state.cross.calls.21214 
[2015.8] Add __states__ to state modules, for cross-calling states
 2015-08-28 12:05:35 -06:00
Nicole Thomas
4b3fc39ef0 Merge pull request #26744 from basepi/revert.loader.changes.26645 
[2015.8] Fix issue from #26717
 2015-08-28 11:34:44 -06:00
Justin Findlay
5f379dcec4 Merge pull request #26737 from dmurphy18/dgm_debfix 
Fix to allow for package naming other than just salt
 2015-08-28 11:26:42 -06:00
Justin Findlay
22dbce8d61 Merge pull request #26736 from twangboy/fix_21256 
Changed import from smbconnection to smb3
 2015-08-28 11:23:42 -06:00
rallytime
56d4d6dadc Make sure nova configs are set before checking for dependencies 2015-08-28 11:16:59 -06:00
rallytime
f3651b5865 User correct vm_ key values 2015-08-28 11:14:52 -06:00
rallytime
4a01779bbf Make sure pyrax configs are in place before checking for deps 2015-08-28 11:07:12 -06:00
Joseph Hall
8ecda99953 Merge pull request #26742 from rallytime/move_vsphere_warning 
Only warn about vsphere deprecation if vsphere is configured
 2015-08-28 11:03:42 -06:00
Colton Myers
7475bad1c8 Only generate __grains__ and __salt__ if we're loading the module 
Also only load once __opts__ is available
 2015-08-28 11:03:18 -06:00
Colton Myers
9ea1ea6ce4 Merge pull request #26733 from sjorge/smartos-vmadm 
Refactor of smartos_vmadm module
 2015-08-28 10:42:23 -06:00
rallytime
ed8efbb178 Only warn about vsphere deprecation if vsphere is configured 2015-08-28 10:36:57 -06:00
Jorge Schrauwen
1c57706d92 Change deprication target to Nitrogen for smartos_legacy 2015-08-28 16:24:14 +00:00
Colton Myers
32d9eb62bb Merge pull request #26735 from s0undt3ch/hotfix/spm-setup-syspaths 
Add `.hg` and `.cvs` to spm_build_exclude
 2015-08-28 10:16:39 -06:00
Colton Myers
cb9fddda59 Merge pull request #26720 from UtahDave/2015.8-repo-ng 
Updates for winrepo in 2015.8 to support jinja, while maintaining backwards compat
 2015-08-28 10:07:58 -06:00
Colton Myers
df0bc1d01b Merge pull request #26719 from jodv/backport_26532 
Backport 26532 to 2015.8
 2015-08-28 10:06:42 -06:00
David Murphy
aa78cc3164 Fix to allow for package naming other than just salt 2015-08-28 10:04:51 -06:00
Colton Myers
16d4e0350d Merge pull request #26714 from jfindlay/pack_except 
add exception placeholder for older msgpacks
 2015-08-28 10:02:35 -06:00
twangboy
86f425c669 Changed import from smbconnection to smb3 2015-08-28 10:00:37 -06:00
Pedro Algarvio
fa32f18c87 Fix the CVS directory 2015-08-28 16:34:37 +01:00
Pedro Algarvio
cc0fe22114 Add .hg and .cvs to spm_build_exclude 
Does anyone still use CVS?
 2015-08-28 16:23:46 +01:00
Jorge Schrauwen
6c71fed3b3 lint fixes and warnings 2015-08-28 14:30:06 +00:00
Mike Place
2e18c093c5 Merge pull request #26721 from rallytime/linode-cleanup 
Linode Driver Cleanup
 2015-08-28 08:20:16 -06:00
Jorge Schrauwen
afb66573b0 vmadm.send - local only 2015-08-28 13:49:12 +00:00
Pedro Algarvio
c92b265a1f Merge pull request #26707 from techhat/spmpaths 
Add top_level_dir to FORMULAs
 2015-08-28 14:25:23 +01:00
Jorge Schrauwen
657bc8fe7e vmadm.update implemented 2015-08-28 12:38:41 +00:00