valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,757 Commits 24 Branches 182 Tags 341 MiB
fcc2196a5f
Commit Graph

42757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
Mike Place
3ea390f4b5 Merge pull request #18617 from rallytime/disable_max_files_test 
Skip test_max_open_files test until we can find the real problem
 2014-12-01 14:45:03 -07:00
Joseph Hall
a5a92db7e6 Merge pull request #18618 from juiceinc/2014.7 
Fixed allocate_new_eip typo in AWS cloud docs
 2014-12-01 13:53:35 -07:00
Tim O'Guin
39fb372898 fixed allocate_new_eip typo in AWS cloud docs 2014-12-01 14:46:32 -06:00
rallytime
3760915099 Skip test_max_open_files test until we can find the real problem 2014-12-01 13:43:57 -07:00
Thomas S Hatch
028da8fd84 Merge pull request #18603 from techhat/issue18451 
Allow volumes to be tagged upon creation
 2014-12-01 13:29:18 -07:00
Thomas S Hatch
a8eb6da49d Merge pull request #18605 from techhat/pagerduty 
Fix CLI examples in pagerduty
 2014-12-01 13:29:07 -07:00
Thomas S Hatch
86d99fa41a Merge pull request #18606 from techhat/pagerdutyrunner 
Add runner for PagerDuty
 2014-12-01 13:28:57 -07:00
Thomas S Hatch
04c443efb4 Merge pull request #18607 from thatch45/freimer-cloud-formation 
Merge #18555
 2014-12-01 13:27:45 -07:00
Thomas S Hatch
caee67a05b Merge pull request #18588 from kormoc/bug_18587 
Fixes #18587, this considers nofail as a invisible mount option. This sh...
 2014-12-01 10:30:13 -07:00
Thomas S Hatch
bf2950453d Merge pull request #18577 from garethgreenaway/18534_2014_7_schedule_cpu_spike 
Fixes to scheduler in 2014.7
 2014-12-01 10:26:18 -07:00
Thomas S Hatch
5cd3797680 Merge pull request #18574 from keesbos/bugfix-__env__ 
Bugfix git_pillar (__env__ related)
 2014-12-01 10:25:40 -07:00
Thomas S Hatch
804fbf966c Merge pull request #18568 from terminalmage/issue18468 
Fix yum pkg holding when doing version pinning with "pkgs" arg
 2014-12-01 10:25:05 -07:00
Thomas S Hatch
e090694c66 Merge pull request #18560 from ewdurbin/git_https_basic_auth 
allow for git HTTP Basic Auth when using https://
 2014-12-01 10:24:22 -07:00
Thomas S Hatch
e9733ec031 Merge pull request #18557 from eliasp/2014.7-pillar.pillar_ldap-no-results-logging 
Move the log message in case no results were returned into the right block
 2014-12-01 10:23:04 -07:00
Thomas S Hatch
e7f3be396b Merge pull request #18556 from eliasp/2014.7-pillar.pillar_ldap-anonymous_bind 
Prevent 'DSID-0C0906E8' error when binding to ActiveDirectory.
 2014-12-01 10:22:15 -07:00
Thomas S Hatch
c7fa2ee497 lint, remove unused imports 2014-12-01 10:20:01 -07:00
Thomas S Hatch
205501fd5a Merge branch 'cloud-formation' of https://github.com/freimer/salt into freimer-cloud-formation 2014-12-01 10:19:41 -07:00
Thomas S Hatch
e2a0c0c754 Merge pull request #18543 from whiteinge/raet-compat-event-listen 
Switch to RAET-compatible event listener
 2014-12-01 10:16:46 -07:00
Joseph Hall
60a7c4af2e Update docs to reflect runner status 2014-12-01 10:15:13 -07:00
Joseph Hall
0f06c64562 Add runner for PagerDuty 2014-12-01 10:13:00 -07:00
Joseph Hall
1a5a6497e1 Fix CLI examples in pagerduty 2014-12-01 10:12:11 -07:00
Thomas S Hatch
297693242b Merge pull request #18526 from techhipster/saltmod-cmd-all-output 
Saltmod cmd all output
 2014-12-01 10:07:12 -07:00
Thomas S Hatch
26e76250a6 Merge pull request #18507 from theksk/file-diskusage 
File diskusage
 2014-12-01 10:06:04 -07:00
Thomas S Hatch
36a4bf2d76 Merge pull request #18498 from jfindlay/quote_virtualenv 
quote strs in virtualenv mod
 2014-12-01 10:05:13 -07:00
Joseph Hall
ff0a313e61 Allow volumes to be tagged upon creation 2014-12-01 09:32:26 -07:00
Joseph Hall
dcdd2ae7ea Merge pull request #18589 from dmyerscough/fix-digital-ocean-delete 
Key name was changed in version 2 of the digital ocean API
 2014-12-01 06:07:39 -07:00
Damian Myerscough
376221ab36 Key name was changed in version 2 of the digital ocean API 2014-11-30 22:50:42 -08:00
Rob Smith
0966567d0c Fixes #18587, this considers nofail as a invisible mount option. This should fix mounts that always remount every run. 2014-11-30 20:19:27 -08:00
Joseph Hall
1ea5d0c0aa Merge pull request #18561 from syphernl/fix/proxmox_unused_args 
Remove unused arguments from Proxmox cloudmodule
 2014-11-30 20:28:40 -07:00
Pedro Algarvio
641c119580 Merge pull request #18586 from s0undt3ch/2014.7 
2014.7 Lint disable rules
 2014-12-01 03:25:54 +00:00
Pedro Algarvio
e09750e97d Ignore the locally enabled/disabled pylint checks 2014-12-01 03:24:41 +00:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c Disable some Pylint errors 2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
a985f0ac4e Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
4dcb20eb62 Disable some Pylint errors 2014-12-01 03:23:51 +00:00
Pedro Algarvio
38b95953ef Disable some Pylint errors 2014-12-01 03:23:46 +00:00
Pedro Algarvio
d7a4fdede2 Disable some Pylint errors 2014-12-01 03:20:00 +00:00
Joseph Hall
c3b11c867c Merge pull request #18520 from adminericjacobs/puppet-docs-fix 
Fix documentation in puppet module enable function
 2014-11-29 20:42:38 -07:00
Joseph Hall
1e989d0252 Merge pull request #18524 from garethgreenaway/missing_scheduler_cron_docs 
scheduler docs
 2014-11-29 20:38:08 -07:00
Mike Place
9798f892ad Merge pull request #18575 from eliasp/2014.7_doc_aggregate_typo 
Fix typo (agregate → aggregate).
 2014-11-29 14:33:20 -07:00
Gareth J. Greenaway
f5de037d96 Fixing a bug in the scheduler that caused a runaway job and CPU spikes when using the 'when' paramter. Also some cleanup of redundant calls to time.time and the comparison used to see when a job should run. 2014-11-29 10:59:24 -08:00
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Kees Bos
7d89159456 Bugfix git_pillar (__env__ related) 
Fixes bug that shows up when caches are cleared.
Use dict.get in stead of __getitem__ to catch missing values
in opts.
 2014-11-29 15:34:50 +01:00
Seth House
35ac4a4ea2 Merge pull request #18547 from tjyang/develop 
Follow on patch for https://github.com/saltstack/salt/pull/18536
 2014-11-29 00:50:54 -07:00
Erik Johnson
b11542dab9 Update 2014.7.1 release notes 2014-11-28 16:55:49 -06:00
Erik Johnson
55dac6f73c Fix yum pkg holding when doing version pinning with "pkgs" arg 
Resolves #18468
 2014-11-28 10:57:41 -06:00
Pedro Algarvio
546ecd77da Merge pull request #18542 from techhat/issue18538 
Better opts checking for #18538
 2014-11-28 13:09:11 +00:00
Pedro Algarvio
ab44a1473c Merge pull request #18559 from techhat/pagerduty 
Start filling out more PagerDuty functions (list items)
 2014-11-28 13:07:25 +00:00