rallytime
7f170c126f
Remove 'RC1' from GIT_VERSION comparison
2014-08-14 11:06:18 -06:00
steve
091c40df21
save
2014-08-14 12:40:27 -04:00
rallytime
fe5b8d22ec
Fix gitpillar skipIfs
2014-08-14 10:34:38 -06:00
Branden Timm
4f411006db
Fixed example usage in docstring for grains.filter_by
2014-08-14 11:06:45 -05:00
rallytime
399c022233
Remove unused argument from boto_cloudwatch_alarm.absent
...
Fixes #14925
2014-08-14 09:29:34 -06:00
Jon Henry
c065ac4f50
Fix gem unit test with new proxy parameter
2014-08-14 00:22:52 -06:00
Jon Henry
599917e9c5
Issue 14304: add proxy parameter to gem state
2014-08-13 23:32:42 -06:00
Colton Myers
92742f7e08
No second person
2014-08-13 17:33:06 -06:00
Thomas S Hatch
53fed2cc63
Merge branch '2014.7' into develop
2014-08-13 17:02:19 -06:00
Thomas S Hatch
2d0d6b508e
Merge pull request #14973 from thatch45/2014.7
...
Better approach to #14955
2014-08-13 17:01:43 -06:00
Seth House
d6818325c8
Add mention of the `names` expansion to the 2014.7 release notes
...
Refs #14971
2014-08-13 19:01:21 -04:00
Seth House
e2ed04351d
Merge remote-tracking branch 'upstream/2014.7' into develop
...
Conflicts:
salt/modules/npm.py
2014-08-13 18:56:23 -04:00
Thomas S Hatch
d6b8fb21c6
Merge pull request #14972 from thatch45/josemine-develop
...
Merge #14941 with fixes
2014-08-13 16:55:24 -06:00
Thomas S Hatch
c2d2ed68ea
Merge pull request #14971 from whiteinge/doc-names-override
...
Documented the expansion additon to names
2014-08-13 16:54:53 -06:00
Thomas S Hatch
a0d7163abb
Merge pull request #14967 from rallytime/pillar_tests
...
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
2014-08-13 16:53:56 -06:00
Thomas S Hatch
180c939a53
Merge pull request #14966 from avandendorpe/patch-1
...
Fixed "previous releases" docs link
2014-08-13 16:52:55 -06:00
Thomas S Hatch
73c5b600a6
fix perms on proxmox.py
2014-08-13 16:51:11 -06:00
Thomas S Hatch
edc374fac7
Merge pull request #14965 from syphernl/fix/proxmox_deletes
...
Salt-cloud: Fix Proxmox VM deletions
2014-08-13 16:50:19 -06:00
Thomas S Hatch
3d32a1cb8d
Merge pull request #14964 from whiteinge/salt-npm-env
...
Add env support to npm
2014-08-13 16:48:56 -06:00
Thomas S Hatch
90cd112931
Better approach to #14955
...
We can just detect if the function is there, so that we on;y need
to add it if the kwargs do need to be massaged.
2014-08-13 16:46:04 -06:00
Thomas S Hatch
adcb67b93b
Merge pull request #14955 from mcalmer/zypper-add-expand_repo_def
...
add expand_repo_def needed by states pkgrepo.managed
2014-08-13 16:43:32 -06:00
Thomas S Hatch
288b57b642
Merge pull request #14950 from gravyboat/develop
...
Add versionadd to postgres_extension, update troubleshooting guides to explain timeouts, pull slspath from best_practices
2014-08-13 16:39:02 -06:00
Seth House
d85791e3ef
Documented the expansion additon to names
...
Added docs for the addition in #13489 .
2014-08-13 18:19:02 -04:00
Thomas S Hatch
1f27fbbdd2
lint fixes
2014-08-13 16:14:56 -06:00
Thomas S Hatch
f760769c97
Merge branch 'develop' of https://github.com/josemine/salt into josemine-develop
2014-08-13 16:13:41 -06:00
Thomas S Hatch
9cb46dd61d
Merge pull request #14936 from cachedout/ckminion_stats
...
Reduce unnecessary stats in minion cache
2014-08-13 16:06:07 -06:00
Thomas S Hatch
cfdaba5a62
Merge pull request #14935 from whiteinge/salt-orchestrate-event
...
Added wait_for_event function to saltmod
2014-08-13 16:05:36 -06:00
Thomas S Hatch
58517a96cc
Merge branch '2014.7' into develop
2014-08-13 15:46:17 -06:00
Thomas S Hatch
48da5f486d
Merge pull request #14969 from thatch45/2014.7
...
Add template files to manifest so they get included
2014-08-13 15:45:34 -06:00
Thomas S Hatch
b755ed1c84
Add template files to manifest so they get included
...
in python 2.6 builds because package_data was changed in 2.7
2014-08-13 15:44:25 -06:00
rallytime
496cfe25b3
Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed
2014-08-13 14:14:53 -06:00
Alain Vandendorpe
c568cbaeb4
Fixed "other versions" link
...
The link to previous docs releases was a redirect to the latest index page. Fixed.
I would argue the de facto docs version should be "latest stable", but this is an in-place fix for the status quo.
2014-08-13 12:52:23 -07:00
Frank Klaassen
5927138f49
Salt-cloud: Fix Proxmox VM deletions
...
Prior to this change, it was using the wrong ID (concatted id + tech) while there is one that is pre-concatted so using that instead now.
Also, the VM needs to be stopped prior to being deleted. The VM is now being stopped and checked whether its in this state before it proceeds
2014-08-13 21:50:08 +02:00
Seth House
8f8cb959e0
Also pass runas and env through to npm.list
2014-08-13 15:34:30 -04:00
Forrest
39b4c21c3d
Fix a typo in the master conf.
2014-08-13 11:09:05 -07:00
Forrest
5145e3b448
Fix a typo
2014-08-13 11:08:35 -07:00
Seth House
aafc061e26
Added an env arg to npm module & state
...
Because npm can be configured using env vars.
2014-08-13 13:45:42 -04:00
Thomas S Hatch
2aa208f636
Merge pull request #14930 from whiteinge/doc-event-fire_master_env-sudo
...
Update event.fire_master_env docstring with sudo instructions
2014-08-13 10:38:39 -06:00
Thomas S Hatch
80a7c85b03
Merge pull request #14901 from Nibbler999/fix-custom-grains-override
...
Fix custom grains override
2014-08-13 10:35:26 -06:00
Colton Myers
fb189dae63
Merge branch '2014.7' into develop
2014-08-13 10:26:20 -06:00
Colton Myers
6e3a83fbad
Merge pull request #14931 from basepi/rcdocs
...
Add installation docs for Salt release candidate
2014-08-13 10:25:23 -06:00
Colton Myers
fab84fa831
Merge pull request #14940 from rallytime/fix_pillar_tests
...
Fix pillar mysql tests
2014-08-13 10:05:52 -06:00
Thomas S Hatch
35b654c2c5
Merge pull request #14942 from UtahDave/2014.7temp
...
Fix unicode output error on Windows salt-call
2014-08-13 09:54:38 -06:00
Joseph Hall
6a0bfbf11f
Merge pull request #14959 from s0undt3ch/2014.7
...
Remove unused imports and fix white-space lint issues.
2014-08-13 09:43:29 -06:00
Pedro Algarvio
c3b064b717
Remove unused imports and fix white-space lint issues.
2014-08-13 16:42:36 +01:00
Michael Calmer
97b2292831
fix pylint add extra line
2014-08-13 15:59:15 +02:00
Michael Calmer
184bf5f881
add expand_repo_def needed by states pkgrepo.managed
2014-08-13 15:14:28 +02:00
Joseph Hall
25352b93a9
Merge pull request #14954 from mcalmer/fix-zypper-set-autorefresh
...
fix set autorefresh in zypper module
2014-08-13 07:10:59 -06:00
Michael Calmer
fd8f0370bf
fix set autorefresh in zypper module
...
fix:
"Failed to configure repo '<reponame>': in method
'RepoInfoBase_setAlias', argument 2 of type 'std::string const &'"
2014-08-13 14:59:29 +02:00
Forrest Alvarez
fec0c4e035
Update best_practices to resolve issue where slspath is used, but not yet implemented/explained.
2014-08-13 04:57:14 +00:00
