valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,475 Commits 24 Branches 182 Tags 341 MiB
041bda018d
Commit Graph

29475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narcolapser
05652d6509 changed 'download' and 'install' to 'downloaded' and 'installed' to make it match intended state better. 
made some minor changes to how name is used. If you want to address a single category of updates, you can now do it through the name, making name less vestigial. But if you want to have multiple categories, you still must do it through categories. and as such, categories still exists as an independent entity.
 2014-04-15 12:18:21 +01:00
Pedro Algarvio
7a945b438a Allow matching minions using compound match(ID + grains) 2014-04-15 11:21:15 +01:00
Pedro Algarvio
704426f6d0 Merge pull request #12000 from s0undt3ch/develop 
Fix compound example.
 2014-04-15 11:20:38 +01:00
Pedro Algarvio
3cd612d2c4 Fix compound example. 
Refs 11195cbd2d
 2014-04-15 10:55:26 +01:00
Pedro Algarvio
5fbd38f40c Merge pull request #11999 from s0undt3ch/hotfix/jenkins 
Several Lint Fixes
 2014-04-15 09:54:03 +01:00
Pedro Algarvio
afd63deacc Fix PEP8 E303: too many blank lines (3) 2014-04-15 09:52:12 +01:00
Pedro Algarvio
ac4c042a55 Fix E8251 unexpected spaces around keyword / parameter equals 2014-04-15 09:51:16 +01:00
Pedro Algarvio
4d154daee4 Merge pull request #11998 from s0undt3ch/hotfix/npm-versionadded 
Add `versionadded` to registry support in NPM. Refs #11926.
 2014-04-15 09:47:26 +01:00
Pedro Algarvio
8e8abc9d3b Add versionadded to registry support in NPM. Refs #11926. 2014-04-15 09:45:28 +01:00
Pedro Algarvio
244967a9b5 Allow for a 2nd system preparation sls file. 2014-04-15 09:42:33 +01:00
Pedro Algarvio
4f9ebe86eb Merge pull request #11926 from vortec/npm_registry 
npm state module: Add parameter to specify a custom NPM server
 2014-04-15 09:40:59 +01:00
Pedro Algarvio
07d6dbcc2f Merge pull request #11997 from whiteinge/salt-remove-external_ip 
Moved the external_ip grain into salt-contrib
 2014-04-15 08:35:05 +01:00
Seth House
ff35fef57c Moved the external_ip grain into salt-contrib 2014-04-15 00:57:48 -06:00
Samuel Lai
84e29ac56f Renamed method to better reflect what it does. 2014-04-15 12:35:55 +10:00
Samuel Lai
4642f56409 Fixed py-lint errors and also a merge bug with makedirs. 2014-04-15 12:33:07 +10:00
Thomas S Hatch
58b094ec1b Add cli example 2014-04-14 18:57:42 -06:00
Thomas S Hatch
786ec2bf8c Don't show stack traces for zmq in raet 2014-04-14 18:44:43 -06:00
Thomas S Hatch
26316569ed set ioflo verbose to 0, the noise is no longer needed by default 2014-04-14 18:41:19 -06:00
Thomas S Hatch
5638596ead the site reload is breaking macos states!!!! 
@basepi, if this line is in 2014 [please cherrypick
 2014-04-14 18:05:26 -06:00
Thomas S Hatch
3384d1b54a Revert "Fix filelisting infinite loops" 
This reverts commit ef8043bf0b.
 2014-04-14 17:18:20 -06:00
Erik Johnson
2a9c1deb17 Fix incorrect documentation 2014-04-14 17:18:48 -05:00
Thomas S Hatch
737940c1fc Pass in correct names 2014-04-14 16:05:21 -06:00
Samuel Smith
89559e7001 Merge pull request #11992 from SmithSamuelM/sam_raet_36 
Fix many external Raet refactor bugs
 2014-04-14 15:39:25 -06:00
Samuel M Smith
425edb00e5 Merge remote-tracking branch 'upstream/develop' into sam_raet_36 2014-04-14 15:38:39 -06:00
Samuel M Smith
1c024ebc51 Fix External Raet REfactoring bugs 2014-04-14 15:37:47 -06:00
Thomas S Hatch
a4d65ae3b7 Fix indentation error in hold_pkg logic 2014-04-14 15:11:53 -06:00
Erik Johnson
685b3a6b4f Fix traceback in docker.running state 
This improves error reporting when invalidly-formatted input is
submitted from the docker.running state to the docker.start execution
fucntion.
 2014-04-14 15:52:55 -05:00
Fabian Kochem
74d5591af7 new parameter: 'registry' for NPM module 2014-04-14 22:48:05 +02:00
Thomas S Hatch
f22c9aacf5 Merge pull request #11987 from toumorokoshi/showtimeout 
Add show_timeout option to master config
 2014-04-14 14:45:16 -06:00
Yusuke Tsutsumi
50b7bed030 fixes #1192. 
* Adding config file option for salt master configuration
 2014-04-14 16:33:33 -04:00
Thomas S Hatch
fc09454d90 Merge pull request #11985 from toumorokoshi/specialCopy 
Fixes #11966, clearer interface for files.copy
 2014-04-14 14:27:00 -06:00
Thomas S Hatch
e09cf64a99 Merge pull request #11984 from terminalmage/issue11889 
Use /usr/local/etc/salt as fallback CONFIG_DIR only on FreeBSD
 2014-04-14 14:23:12 -06:00
Thomas S Hatch
6a985a10ac Merge pull request #11977 from simonfrid/feature/log_minion_pid 
logging process id
 2014-04-14 14:22:37 -06:00
Thomas S Hatch
a3faf17f10 Merge pull request #11976 from cachedout/nodegroups_doc 
Add note about master restart per nodegroups.
 2014-04-14 14:21:18 -06:00
Thomas S Hatch
95233ec3dd Merge pull request #11975 from techhat/genesis 
New system bootstrap code
 2014-04-14 14:20:31 -06:00
Thomas S Hatch
9b7d7f1fbc Merge pull request #11971 from holmboe/finally-umask 
Use finally clause for setting back umask
 2014-04-14 14:17:57 -06:00
Thomas S Hatch
359d92f5d3 Merge pull request #11967 from borgstrom/pyobject_imports 
Allow for "imports" within pyobjects files
 2014-04-14 14:16:35 -06:00
Yusuke Tsutsumi
fa7385d7a5 modifying behaviour to reduce arguments 2014-04-14 16:15:37 -04:00
Thomas S Hatch
72bec3e5da Merge pull request #11965 from terminalmage/issue11517 
Allow minion_id to be specified for certain match functions
 2014-04-14 14:15:34 -06:00
Thomas S Hatch
43bfe41e51 Merge pull request #11963 from garethgreenaway/develop 
Additions to yumpkg.py, aptpkg.py and pkg.py
 2014-04-14 14:11:26 -06:00
Thomas S Hatch
0fe1cd5c61 Merge pull request #11929 from cachedout/11918 
Fix compound matching with parens.
 2014-04-14 14:04:23 -06:00
Thomas S Hatch
badc980a2d Merge pull request #11928 from jcsp/fix-aes-reauth 
Detect AES key changes in _fire_master
 2014-04-14 14:03:27 -06:00
Thomas S Hatch
2d7da41d62 Merge pull request #11921 from mtorromeo/systemd-units 
Better handling of systemd parametrised and other special units not listed by list-unit-files.
 2014-04-14 13:44:41 -06:00
Thomas S Hatch
244f4fddbf Merge pull request #11887 from makinacorpus/fl 
Fix filelisting infinite loops
 2014-04-14 13:40:53 -06:00
Yusuke Tsutsumi
6a8fbda076 Fixes #11966, clearer interface for files.copy 
* adds recurse flag (required when copying directories)
* adds (merge|remove)_existing, to choose whether to keep existing files, or delete the target directory entirely.
 2014-04-14 15:34:36 -04:00
Erik Johnson
e5f50df804 Use /usr/local/etc/salt as fallback CONFIG_DIR only on FreeBSD 2014-04-14 14:25:12 -05:00
Mike Place
0c9f7eb356 Merge pull request #11983 from xenuser/fix_11961 
Refs #11961: Add a short note regarding --show-timeout in the salt manpage
 2014-04-14 13:15:10 -06:00
Valentin Hoebel
ff07ccac94 Refs #11961: Add a short note regarding --show-timeout in the salt manpage 2014-04-14 21:11:01 +02:00
Joseph Hall
d5a25a1814 Merge pull request #11982 from toumorokoshi/introspect 
Adding introspection methods for yum and apt-get
 2014-04-14 12:58:59 -06:00
Yusuke Tsutsumi
8e14e8b069 fixes for bugs that pylint found 2014-04-14 14:38:39 -04:00