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
42,821 Commits 24 Branches 182 Tags 341 MiB
680689e78a
Commit Graph

42821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Beausejour
680689e78a Updated documentation for GCE: 
- Support for fixed address
  - New salt function for create_address, delete_address, show_address
 2014-12-02 15:38:00 -05:00
Benoit Beausejour
5dfa300537 - Add new cloud provider parameter: ssh_interface (akin to the EC2 module). 
- GCEAddress handling with libcloud
  - Allow create,delete address in GCE
  - Allow creation of VM and LB with named fixed GCEAddress
 2014-12-02 15:25:26 -05:00
Thomas S Hatch
3054dd9717 Merge pull request #18646 from thatch45/SmithSamuelM-sam_call2 
Merge #18631 with fixes
 2014-12-02 10:08:50 -07:00
Thomas S Hatch
6308484b58 forgot the : in pylint disable 2014-12-02 10:08:12 -07:00
Thomas S Hatch
a6841f6296 Merge pull request #18621 from gtmanfred/develop 
Allows archives to be extracted as a user
 2014-12-02 10:05:41 -07:00
Thomas S Hatch
abc6859e09 Merge pull request #18622 from Supermathie/develop 
alternative way of restarting windows minion
 2014-12-02 10:05:16 -07:00
Thomas S Hatch
6d0584319a Merge pull request #18626 from garethgreenaway/random_org_fixes 
Fixes to random.org module
 2014-12-02 10:05:01 -07:00
Thomas S Hatch
723ff641a0 lint and syntax 2014-12-02 09:55:16 -07:00
Thomas S Hatch
86ba064b40 clean up invalid syntax 2014-12-02 09:39:03 -07:00
Thomas S Hatch
dab8a46ccf lint 2014-12-02 09:38:10 -07:00
Thomas S Hatch
7bb034edc0 lint 2014-12-02 09:37:40 -07:00
Thomas S Hatch
410b80a118 lint 2014-12-02 09:36:54 -07:00
Thomas S Hatch
84a9bbe8fa Merge branch 'sam_call2' of https://github.com/SmithSamuelM/salt into SmithSamuelM-sam_call2 2014-12-02 09:35:38 -07:00
Joseph Hall
3e8e25a846 Merge pull request #18639 from analogbyte/develop 
Document the dependencies for the schedule options 'when' and 'range'
 2014-12-02 06:45:44 -07:00
Daniel Nägele
81164c17e7 document the dependencies for the schedule options 'when' and 'range' 2014-12-02 13:33:50 +01:00
Pedro Algarvio
347ad77e53 Merge pull request #18530 from s0undt3ch/develop 
Merge branch '2014.7' forward into develop
 2014-12-02 02:58:34 +00:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
aa56018067 Merge branch '2014.7' into develop 2014-12-02 01:25:54 +00:00
Pedro Algarvio
74110d845f Don't assume the PATH env var is set 2014-12-02 01:25:31 +00:00
Pedro Algarvio
4d759b90dd Don't assume the PATH env var is set 2014-12-02 01:15:37 +00:00
Pedro Algarvio
07ad4435a1 Don't assume the PATH env var is exists. 2014-12-02 01:14:00 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Samuel M Smith
cca20fa984 Merge remote-tracking branch 'upstream/develop' into sam_call2 
Conflicts:
	salt/master.py
	salt/runner.py
	salt/utils/raetevent.py
 2014-12-01 17:42:36 -07:00
Samuel M Smith
92627c3bc9 Added factory for MasterEvent when using raet 2014-12-01 17:31:58 -07:00
Pedro Algarvio
4372415db8 Merge branch 'merge-forward' of https://github.com/basepi/salt into develop 
Conflicts:
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 00:30:31 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
Gareth J. Greenaway
9e431d5677 Fixes to random.org module removing unnecessary arguments to function calls. 2014-12-01 14:12:53 -08:00
Colton Myers
749c4f58e6 Bad merge conflict resolve runner.py 2014-12-01 15:07:19 -07:00
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
Michael Brown
9b39eae40c alternative way of restarting windows minion 2014-12-01 16:51:58 -05: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
Daniel Wallace
f21e3e2810 Allows archives to be extracted as a user 
closes #12642
 2014-12-01 15:44:03 -06: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