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

32120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
c883935db8 Switch to string formatting 2014-06-19 11:54:14 +01:00
Pedro Algarvio
ac8bec8c01 Double to single quotes 2014-06-19 11:51:22 +01:00
Thomas S Hatch
060f34f746 Merge pull request #13526 from s0undt3ch/hotfix/setup-raet 
simpler requirements setup
 2014-06-18 23:55:01 -06:00
Thomas S Hatch
9dfbf5aced Merge pull request #13556 from nmadhok/fix-doc-typo 
Fixed typo
 2014-06-18 23:50:20 -06:00
Nitin Madhok
2e27b9d1df Fixed typo 2014-06-19 01:40:39 -04:00
Thomas S Hatch
5fd0f6c476 Lint fixes per #13553 2014-06-18 23:19:17 -06:00
Thomas S Hatch
342a179af0 Merge pull request #13553 from alex-leonhardt/interface_ip 
Make salt '*' network.interface iface   and   network.interface_ip iface...
 2014-06-18 23:18:01 -06:00
Thomas S Hatch
3db12ce978 Fix ordereddict issue from #13552 2014-06-18 23:10:50 -06:00
Thomas S Hatch
eb5f178e55 Merge pull request #13552 from garethgreenaway/westurner_merge 
Changes to debian_ip.py and related bits
 2014-06-18 23:03:18 -06:00
Thomas S Hatch
96c1cd0e53 no need to raise the exc, it propogates 2014-06-18 22:59:56 -06:00
Thomas S Hatch
bc7ff6b223 Merge pull request #13549 from cachedout/13546 
Multi-master start race condition
 2014-06-18 22:59:18 -06:00
Thomas S Hatch
28fbeda57b Merge pull request #13543 from gtmanfred/develop 
Fix disable placement for pylint
 2014-06-18 22:58:08 -06:00
Thomas S Hatch
2fcf619c5e fix lint error from #13542 2014-06-18 22:56:19 -06:00
Thomas S Hatch
00f4f8765f Merge pull request #13542 from panoptix-za/docker_io_updates 
Better Docker message handling.
 2014-06-18 22:54:22 -06:00
Thomas S Hatch
7bed91e515 Merge pull request #13517 from cro/esc_sequences_develop 
Strip terminal escape sequences when unnecessary.
 2014-06-18 22:37:08 -06:00
Gareth J. Greenaway
b2fa638d6d Merging in the awesome work @westurner added to debian_ip.py for improved support for Debian & Ubuntu networking. A bit of additional cleanup. 2014-06-18 20:14:42 -07:00
Joseph Hall
75f2da81e0 Merge pull request #13548 from gtmanfred/apply_sdb 
add apply_sdb function
 2014-06-18 19:37:00 -06:00
Daniel Wallace
fafb18920f order the get_sdb correctly 2014-06-18 19:35:32 -05:00
Pedro Algarvio
305691bb8c Merge pull request #13551 from rallytime/cloud_provider_unit_tests 
Cloud provider unit tests
 2014-06-19 01:21:17 +01:00
Daniel Wallace
123b6e1e41 if value is None and thus the default continue 2014-06-18 19:14:08 -05:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
Daniel Wallace
03cf457e55 order arguments correctly 2014-06-18 18:36:23 -05:00
Alex Leonhardt
438bbe25d6 Make salt '*' network.interface iface and network.interface_ip iface available 2014-06-19 00:20:54 +01:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
Pedro Algarvio
1d0fdd5a6c Allow transport to be none to skip ZeroMQ deps 2014-06-19 00:07:30 +01:00
Pedro Algarvio
5a781eb9a6 Support the best possible option for all 
* pip based installations default to ZeroMQ:

  pip install salt

* pip based installations can additionally install REAT deps

  pip install salt[RAET]

On local checkout's:

* pip based installation with requirements files can choose which, or both, just use the right requirements file(s)

  pip install -r raet-requirements.txt

* pass ``--salt-transport` to choose which, `zeromq`, `raet` or `both`. Choosing `raet` removes the `zeromq` deps
 2014-06-18 23:56:24 +01:00
Daniel Wallace
b4ecc70a52 remove deepcopy 
We want to modify the original anyway
 2014-06-18 17:42:53 -05:00
Daniel Wallace
cb1a780247 fix pylint for unreachable code 2014-06-18 17:25:14 -05:00
Daniel Wallace
a1e6c00a4f stop --set-password argument 2014-06-18 17:14:32 -05:00
Mike Place
102869a864 Multi-master start race condition 
Don't explode in most unsual ways if we start a multi-master minion
before a master is ready.

Closes #13546
 2014-06-18 16:14:02 -06:00
Daniel Wallace
5d9959caf3 reorganize apply_sdb 
get_sdb requires opts
 2014-06-18 16:59:05 -05:00
Daniel Wallace
973179ef1b should be sdb_opts and not value 2014-06-18 16:46:51 -05:00
Colton Myers
9aad57ecea Merge pull request #13547 from cachedout/13187 
Don't endlessly refresh pillars in multi-master
 2014-06-18 15:46:45 -06:00
Daniel Wallace
07e914db95 implement grabbing the sdb:// data 
Hooray recursion
 2014-06-18 16:40:12 -05:00
C. R. Oldham
48b498bb2f Fix pylint (again) 2014-06-18 15:38:11 -06:00
Mike Place
45df5d4719 Don't endlessly refresh pillars in multi-master 
Closes #13187
 2014-06-18 15:36:24 -06:00
C. R. Oldham
8b12151aad Fix pylint 2014-06-18 15:24:45 -06:00
Samuel Smith
9b8662a689 Merge pull request #13545 from SmithSamuelM/sam_raet_45 
Fixed parameter to be compat with RAET v0.0.20
 2014-06-18 15:03:29 -06:00
Samuel M Smith
3597ef6066 Merge remote-tracking branch 'upstream/develop' into sam_raet_45 2014-06-18 15:01:45 -06:00
Samuel M Smith
3d86d2414d Fixe interface to be compat with RAET v0.0.20 2014-06-18 15:00:38 -06:00
Daniel Wallace
bd27c0b21c Fix disable placement for pylint 2014-06-18 14:18:47 -05:00
Stephan Buys
c72bf5d13e Better message handling. 2014-06-18 20:44:59 +02:00
Thomas S Hatch
6890d04947 Merge pull request #13539 from fessoga5/develop 
Small fix, add space for dev in route_eth.jinja
 2014-06-18 11:04:28 -06:00
Thomas S Hatch
2d332830eb Merge pull request #13524 from lyft/supervisord-no-false-positive 
Do not throw errors for supervisor when success
 2014-06-18 10:46:08 -06:00
Thomas S Hatch
48af06092c Merge pull request #13523 from cachedout/13436 
Include grains_dirs in loader
 2014-06-18 10:42:09 -06:00
Thomas S Hatch
8da39f1aff Merge pull request #13521 from cro/load_loc_notnegative_develop 
Make sure file_rec is not negative
 2014-06-18 10:38:25 -06:00
Thomas S Hatch
1644cffed4 Merge pull request #13520 from rallytime/pkgrepo_doc_fix 
Add enabled to pkgrepo config values
 2014-06-18 10:37:13 -06:00
Thomas S Hatch
4ac3cf9d9d Merge pull request #13472 from felskrone/improve_master_alive 
Improve handling of __master_alive scheduled job
 2014-06-18 10:31:26 -06:00
Thomas S Hatch
2f93be691a Merge pull request #13540 from jacksontj/develop 
Support various versions of python-zmq (fix for #13508)
 2014-06-18 10:30:34 -06:00
Colton Myers
6cb859b6da Merge pull request #13394 from basepi/2014.1.5release 
Add release notes for 2014.1.5 and bump docs version
 2014-06-18 10:27:59 -06:00