valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,735 Commits 24 Branches 182 Tags 341 MiB
f0060ee4db
Commit Graph

58735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dsumsky
f0060ee4db - fixed broken caching in S3 ext_pillar module (file_md5 was a list) 
- added debugging messages
- static parameters are available as module parameters now
 2015-09-08 17:18:32 +02:00
Nicole Thomas
90cd04f2b4 Merge pull request #26947 from techhat/bootstrap 
Add --bootstrap option to Salt Cloud
 2015-09-08 08:41:42 -06:00
Pedro Algarvio
626706e3d2 Merge pull request #26931 from s0undt3ch/hotfix/merge-forward-develop 
Merge 2015.8 forward to develop
 2015-09-08 15:32:31 +01:00
Pedro Algarvio
2d33eaffa8 Merge pull request #26939 from s0undt3ch/develop 
Make sure the bases `_attributes` attribute is included in the subclass
 2015-09-08 15:32:17 +01:00
Joseph Hall
ad3f41eca5 Add --bootstrap option to Salt Cloud 2015-09-08 07:52:03 -06:00
Pedro Algarvio
72881d8819 Make sure the bases _attributes attribute is included in the subclass 2015-09-07 19:53:11 +01:00
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
C. R. Oldham
d513acb3e5 Merge pull request #26914 from cro/salt-proxy-script 
Add salt-proxy script and manpage to setup.py so they will get installed.
 2015-09-04 12:43:34 -06:00
C. R. Oldham
acc73fc546 Add salt-proxy to setup.py so it gets installed. 2015-09-04 12:05:14 -06:00
Mike Place
0fbfea1d2a Merge pull request #26909 from terminalmage/issue26907 
Don't try to git clone from /tmp on Windows
 2015-09-04 10:08:05 -06:00
Erik Johnson
4cbf6488e5 Don't try to git clone from /tmp on Windows 
Fixes #26907.
 2015-09-04 10:47:21 -05:00
Mike Place
a33569a8be Merge pull request #26910 from s0undt3ch/hotfix/26848-event-backwards-compat 
Sometimes the event system is just too fast
 2015-09-04 09:00:39 -06:00
Pedro Algarvio
503e050a75 Sometimes the event system is just too fast 2015-09-04 15:52:06 +01:00
Pedro Algarvio
0935618a46 Merge pull request #26905 from s0undt3ch/hotfix/26848-event-backwards-compat 
Exit the loop if run_once is true
 2015-09-04 13:18:29 +01:00
Pedro Algarvio
b184a91a84 Exit the loop if run_once is true 2015-09-04 12:45:13 +01:00
Joseph Hall
818e4eb71f Merge pull request #26897 from msteed/spm-file-hash-pt2 
spm file hash part deux
 2015-09-03 21:07:44 -06:00
Pedro Algarvio
e8cfcde7a2 Merge pull request #26900 from s0undt3ch/hotfix/26848-event-backwards-compat 
If no tag is passed, don't actually subscribe to anything.
 2015-09-04 01:42:39 +01:00
Pedro Algarvio
415a558696 If not tag is passed, don't actually subscribe to anything. 
Keeps backwards compatibility.
 2015-09-04 01:01:33 +01:00
Pedro Algarvio
61ae7d2cdb Only try to create the default sock dir on failure to create the configured one 2015-09-04 00:59:16 +01:00
Mike Place
1d5fd71fa3 Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat 
Restore backwards compatibility to `salt.utils.event`
 2015-09-03 17:04:45 -06:00
Michael Steed
006400f7c1 get file hash via pkgfiles when installing too 2015-09-03 16:13:14 -06:00
Joseph Hall
8cdf75c8e3 Merge pull request #26896 from msteed/spm-hash-file 
spm remove: use pkgfiles to calculate file hashes
 2015-09-03 15:40:39 -06:00
Nicole Thomas
6a7be957d9 Merge pull request #26891 from jtand/azure_version 
Fixed an unboundlocalerror
 2015-09-03 15:21:36 -06:00
Mike Place
c3a2355a62 Merge pull request #26895 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-03 14:55:46 -06:00
Michael Steed
d6e64ec1a7 lint 2015-09-03 14:30:58 -06:00
Michael Steed
a42651fb38 spm updates 
- add hash_file() routine to salt.spm.pkgfiles.local
- use os.path.exists() instead of pkgfiles.path.exists() in
  _local_install()
 2015-09-03 14:28:21 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
justinta89
1aadbdfc6b Fixed lint error 2015-09-03 13:40:43 -06:00
Mike Place
ef76af9596 Merge pull request #26892 from cachedout/fix_async_tcp-test 
Make the testing ioloop the current one
 2015-09-03 13:29:11 -06:00
Mike Place
57b78d369a Make the testing ioloop the current one 
Otherwise, loops from previous intefere and cause stacktraces on ioloop init
 2015-09-03 13:28:28 -06:00
justinta89
06bea434e1 fixed an unboundlocalerror 2015-09-03 13:16:36 -06:00
Pedro Algarvio
2f40387290 Add test_event_single_wait_0_no_block_False test case 2015-09-03 19:54:57 +01:00
Pedro Algarvio
ae9c6c9cff Workaround wait=0 meaning a blocking call when non blocking is required 2015-09-03 18:06:43 +01:00
Colton Myers
23250d0bd6 Merge pull request #26886 from jtand/azure_version 
Gets the azure version correctly on python-azure 1.0.0
 2015-09-03 10:42:21 -06:00
justinta89
8c42178e1a Fixed a lint error 2015-09-03 10:21:41 -06:00
Pedro Algarvio
6cf3a9438f The default value was False not True 2015-09-03 17:06:48 +01:00
justinta89
5a33017791 Gets the azure version correctly on python-azure 1.0.0 2015-09-03 10:00:36 -06:00
Colton Myers
25d11be803 Merge pull request #26870 from rallytime/bp-26834 
Back-port #26834 to 2015.8
 2015-09-03 10:00:35 -06:00
Mike Place
56a64deb94 Merge pull request #26865 from dmurphy18/dgm_debfix 
Fix apt preferences for apts, repos for pbuilder building for Debian
 2015-09-03 09:43:21 -06:00
Pedro Algarvio
b3f218fe7e The old behaviour was blocking. Let's keep it that way. 2015-09-03 16:24:31 +01:00
Pedro Algarvio
a2ac41b80b Remove comment which no longer makes sense 2015-09-03 15:57:43 +01:00
Pedro Algarvio
19019e8f92 Add missing quotes and full is not deprecated 2015-09-03 15:56:49 +01:00
Pedro Algarvio
dc0fec3be3 Restore backwards compatibility to salt.utils.event 
Fixes #26848
Refs #26000
 2015-09-03 11:11:58 +01:00
Pedro Algarvio
00b9cc9a83 Only place salt's code root dir in sys.path, not anything above that 2015-09-03 10:49:01 +01:00
Mike Place
445eede0a2 Merge pull request #26873 from terminalmage/fix-git-config 
Properly handle getting local config values in older git versions
 2015-09-02 20:23:21 -06:00
Erik Johnson
6f2663a574 Properly handle git config --get on local repo config in older git 2015-09-02 20:58:06 -05:00
Erik Johnson
2f346ad40f Remove redundante call to git.config_get 
It is already run at the end of the git.config_set function, no need to
run it again. Just get the value from the return data of git.config_set.
 2015-09-02 20:58:06 -05:00
Erik Johnson
22341b3139 Add debug logging 
This is a massive test function with steps dependent on each other.
These log messages make it easier to look through the log file to
troubleshoot failures.
 2015-09-02 20:58:06 -05:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
Mike Place
27da42731d Merge pull request #26866 from garethgreenaway/manage_jenkins_via_salt 
Jenkins Module and State Module
 2015-09-02 19:35:54 -06:00