valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,549 Commits 24 Branches 182 Tags 341 MiB
cd072876b7
Commit Graph

47549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
cd072876b7 Merge pull request #20942 from cachedout/context_cache 
Context cache
 2015-02-24 11:30:11 -07:00
Thomas S Hatch
6c20615db8 Merge pull request #20940 from tsaridas/elasticache_get_host 
Added get host for instance and group
 2015-02-24 11:29:43 -07:00
Thomas S Hatch
7a08161f61 Merge pull request #20905 from jacksontj/develop 
Fix for #20869
 2015-02-24 11:24:05 -07:00
Thomas S Hatch
406302dc49 Merge pull request #20717 from steverweber/ipmi 
add ipmi support
 2015-02-24 11:22:59 -07:00
jfindlay
a38c17efde Merge pull request #20901 from aspyatkin/feature-bower 
Add Bower execution and state modules
 2015-02-23 21:40:10 -07:00
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Mike Place
9507c31083 First pass at context caching implementation 2015-02-23 19:27:27 -07:00
jfindlay
8552dd5f47 Merge pull request #20946 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-23 16:36:45 -07:00
Colton Myers
beaf9ef637 Merge pull request #5 from jfindlay/merge 
fix matcher tests for 2015.2->develop merge
 2015-02-23 15:43:53 -07:00
Justin Findlay
ebc6a1f4c8 fix matcher tests for 2015.2->develop merge 2015-02-23 15:39:44 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
Andrea-Redi Tsarida
0a8bdcae9d Added get host for instance and group 2015-02-23 21:39:42 +01:00
Nicole Thomas
8a1667e6e2 Merge pull request #20935 from rallytime/pylint_develop 
Fix pylint errors on develop
 2015-02-23 12:58:53 -07:00
rallytime
0e57d8fe6e Fix pylint errors on develop 2015-02-23 12:24:53 -07:00
jfindlay
ceee052c6f Merge pull request #20927 from hobakill/develop 
adding the file paths for 2014.7.2
 2015-02-23 10:28:50 -07:00
Joseph Hall
02d0dac28e Merge pull request #20930 from rallytime/add_url_arg 
Add url back in for __query_ip_address callback and add a pylint ignore
 2015-02-23 10:10:58 -07:00
rallytime
a66b1d616c Add url back in for __query_ip_address callback and add a pylint ignore 2015-02-23 09:47:00 -07:00
jfindlay
3ccd9620f0 Merge pull request #20923 from bbinet/2015.2_fix20921 
2015.2: fix issue 20921
 2015-02-23 08:34:55 -07:00
Nick Hobart
fbedbf74fb adding the file paths for 2014.7.2 2015-02-23 09:21:39 -06:00
Pedro Algarvio
e60b2b81f2 Merge pull request #20919 from cvrebert/fix-unidiomatic-typechecks 
Fix unidiomatic typechecks
 2015-02-23 11:54:58 +00:00
Robin Björklin
b0cb8c8166 Fixed problem with tags occuring twice with docker.pulled 2015-02-23 12:33:47 +01:00
Chris Rebert
3d5b217beb use is instead of == for class equality checks 
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:460: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
************* Module salt.utils.process
/Users/chris/code/salt/salt/utils/process.py:225: [W1504(unidiomatic-typecheck), ProcessManager.add_process] Using type() instead of isinstance() for a typecheck.
 2015-02-22 19:22:08 -08:00
Chris Rebert
24c70b47f1 use isinstance() instead of type() for typechecks 
************* Module salt.modules.mdadm
/Users/chris/code/salt/salt/modules/mdadm.py:340: [W1504(unidiomatic-typecheck), assemble] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pip_state
/Users/chris/code/salt/salt/states/pip_state.py:476: [W1504(unidiomatic-typecheck), installed.<lambda>] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pkg
/Users/chris/code/salt/salt/states/pkg.py:227: [W1504(unidiomatic-typecheck), _find_install_targets] Using type() instead of isinstance() for a typecheck.
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:462: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
/Users/chris/code/salt/salt/pillar/pepa.py:464: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
 2015-02-22 19:21:10 -08:00
Joseph Hall
72ab2d8238 Merge pull request #20917 from mudfly/getting-started-with-vsphere-doc 
Add 'Getting Started With vSphere' documentation
 2015-02-22 13:01:44 -07:00
Christian Page
309f977d5e Add 'Getting Started With vSphere' documentation 2015-02-22 10:31:42 -07:00
jfindlay
3a61abf639 Merge pull request #20911 from rallytime/fix-20906 
Change the order of -R and -m in linux_acl.modfacl
 2015-02-22 01:06:46 -07:00
Thomas Jackson
16f0409369 Pylint fix 2015-02-21 20:39:07 -08:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
rallytime
965d596903 Change the order of -R and -m in linux_acl.modfacl 
Fixes #20906
 2015-02-21 18:49:06 -07:00
steverweber
0445a9c8a8 add virtual 2015-02-21 20:30:17 -05:00
Thomas Jackson
972147b0c6 Better *fix* for #20899 2015-02-21 13:41:24 -08:00
Thomas Jackson
d92d76f80a Fix typo 2015-02-21 13:16:07 -08:00
Thomas Jackson
77964ec543 Fix for #20869 
Pack "runners" in __salt__ within the runners
 2015-02-21 12:36:49 -08:00
Pedro Algarvio
c85d38c493 Merge pull request #20893 from cvrebert/pylint-enable 
re-enable pylint instead of disabling it twice
 2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7 re-enable pylint instead of disabling it twice 2015-02-20 23:50:30 -08:00
jfindlay
17824a9a19 Merge pull request #20889 from cvrebert/darwin-pkgutil-list-unshadow 
Avoid shadowing list type in modules.darwin_pkgutil
 2015-02-20 23:31:01 -07:00
Alexander Pyatkin
b4f16305fa Add Alexander Pyatkin to AUTHORS 2015-02-21 05:58:18 +00:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0 Implement Bower execution module 2015-02-21 05:56:20 +00:00
Chris Rebert
2a52d54a20 Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120 2015-02-20 21:52:25 -08:00
jfindlay
06cfc4ec88 Merge pull request #20892 from cvrebert/patch-1 
cli/batch.py: re-enable pylint instead of disabling it twice
 2015-02-20 22:33:54 -07:00
jfindlay
b2bb5ff086 Merge pull request #20891 from jfindlay/synology 
pylint #20814
 2015-02-20 22:29:40 -07:00
jfindlay
93c282c5d9 Merge pull request #20888 from jfindlay/s3fs 
pylint #20885
 2015-02-20 22:00:19 -07:00
jfindlay
d28a995892 Merge pull request #20887 from jfindlay/fopen 
pylint #20878
 2015-02-20 21:56:47 -07:00
jfindlay
fecbc4f509 Merge pull request #20886 from saltstack/revert-20883-try_chown 
Revert "try/except salt.utils.fopen chown of file"
 2015-02-20 21:53:15 -07:00
Chris Rebert
4daeae3792 cli/batch.py: re-enable pylint instead of disabling it twice 
Fixes apparent erratum from fb056b41c8
 2015-02-20 20:52:05 -08:00
Justin Findlay
b9c386dd1b fix lint 2015-02-20 21:30:09 -07:00
Jay McConnell
ef75c5f45a Fix disk.usage for Synology OS 
relates to issue <a href="https://github.com/saltstack/salt/issues/20790">#20790</a>
 2015-02-20 21:28:17 -07:00
Justin Findlay
af68f010e0 fix lint 2015-02-20 21:16:20 -07:00
Justin Findlay
c0560680bd fix lint 2015-02-20 21:10:16 -07:00