valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,515 Commits 24 Branches 182 Tags 341 MiB
b4f98fc505
Commit Graph

33515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
b4f98fc505 fix email address 2014-07-07 15:44:36 -06:00
rallytime
e1b6a2a9f1 Remove unnecessary line 2014-07-07 15:37:07 -06:00
rallytime
9aceee587c Test for unicode characters in grains outputter 2014-07-07 15:35:10 -06:00
Mike Place
31dc08c7e2 Merge pull request #13995 from rallytime/typo_fix 
Fixed some typos in modules.dockerio
 2014-07-07 11:02:58 -06:00
rallytime
f5bfbf3d9e Fixed some typos in modules.dockerio 2014-07-07 10:59:30 -06:00
Thomas S Hatch
f63c85f596 Merge pull request #13968 from makinacorpus/tls 
tls additions:
 2014-07-07 08:51:28 -06:00
Thomas S Hatch
b582d8c608 Merge pull request #13965 from nmadhok/add-test-ability-docker-state 
Adding testing ability in pull, push and built dockerio state functions
 2014-07-07 08:48:33 -06:00
Thomas S Hatch
0945e13b23 Merge pull request #13953 from s0undt3ch/features/osrelease-info 
Implement `osrelease_info`. Fixes #13822
 2014-07-07 08:46:49 -06:00
Joseph Hall
03b3f9c95a Merge pull request #13987 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #104
 2014-07-06 17:42:36 -06:00
Pedro Algarvio
6410f4ba59 Update 'doc/.tx/config' - Build #104 
http://cookingwithsalt.org/job/salt/job/transifex/104/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-07 00:28:16 +01:00
Erik Johnson
7dc67a7ce8 Convert :: to code-block 2014-07-06 16:43:51 -05:00
Erik Johnson
67df3a9db4 Fix code-block 
This is another fix to make the docs more accurate with the new sphinx
theme.
 2014-07-05 22:51:05 -05:00
Joseph Hall
21d405f49e Merge pull request #13985 from roxit/develop 
Allow using connection_args in keystone.service_delete
 2014-07-05 07:09:29 -06:00
Pedro Algarvio
aceadc54c6 In the end we want a tuple... 2014-07-05 10:58:08 +01:00
Pedro Algarvio
33e9a075af Implement osrelease_info. Fixes #13822 2014-07-05 10:58:08 +01:00
Shanshi Shi
1e59cd272a Allow using connection_args in keystone.service_delete 2014-07-05 16:17:57 +08:00
Joseph Hall
d5bfe0a827 Merge pull request #13982 from s0undt3ch/hotfix/lint 
Lint Fixes
 2014-07-04 21:18:31 -06:00
Pedro Algarvio
ed7d14e237 White-space lint fix 2014-07-05 00:45:53 +01:00
Pedro Algarvio
bbca1ee7cd White-space lint fix 2014-07-05 00:44:41 +01:00
Thomas S Hatch
70dc6991da Merge pull request #13978 from whiteinge/doc-disclosure-proceedure 
Document security disclosure proceedures
 2014-07-03 21:14:23 -06:00
Seth House
92ebf99a1f Added security disclosure proceedure page 
Closes #2315
 2014-07-03 20:32:52 -06:00
Seth House
ddc4353248 Added central links for the various mailing lists 2014-07-03 20:32:26 -06:00
Joseph Hall
585e95cd40 Merge pull request #13975 from csakoda/develop 
ec2.query: copying params dict so our headers don't leak between attempt...
 2014-07-03 18:44:18 -06:00
Pedro Algarvio
2bb62a1f18 Merge pull request #13977 from hulu/augeas-shadowing 
avoid shadowing in augeas state
 2014-07-04 01:42:14 +01:00
Chris Rebert
8f7e5ea546 augeas state: avoid shadowing change() function 
************* Module salt.states.augeas
salt/states/augeas.py:223: [W0621(redefined-outer-name), setvalue] Redefining name 'change' from outer scope (line 42)
 2014-07-03 17:38:10 -07:00
Chris Rebert
8982842694 augeas state: avoid shadowing built-in file type 
************* Module salt.states.augeas
salt/states/augeas.py:177: [W0622(redefined-builtin), change] Redefining built-in 'file'
 2014-07-03 17:37:33 -07:00
Chuck Sakoda
09851a5425 ec2.query: copying params dict so our headers don't leak between attempts 2014-07-03 17:13:08 -07:00
Pedro Algarvio
ae36d905c2 Merge pull request #13952 from s0undt3ch/hotfix/lint 
Lint Fixes
 2014-07-04 00:57:39 +01:00
Pedro Algarvio
1ffb0e8a51 White-space related fixes 2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14 Move imports 2014-07-04 00:56:48 +01:00
Seth House
9a9a97fca9 Merge pull request #13973 from jacksontj/develop 
Make netapi more of a process manager
 2014-07-03 16:44:15 -06:00
Mike Place
89bf75fe84 Merge pull request #13974 from rallytime/schedule_unit_tests 
Some unit tests for salt.utils.schedule
 2014-07-03 15:55:09 -06:00
rallytime
a7eadd74ff remove unnecessary comment 2014-07-03 15:49:59 -06:00
rallytime
656db75ac0 Started some schedule unit tests 2014-07-03 15:48:46 -06:00
Thomas Jackson
1eb9c0243b Pylint cleanup! 2014-07-03 13:43:10 -07:00
Thomas Jackson
754642a512 Make netapi more of a process manager 
This makes netapi watch for its children and if any die it will create new ones and log the event
 2014-07-03 13:21:20 -07:00
Colton Myers
f11c5267b4 Merge pull request #13970 from techhat/pickles 
File extension should be .p, not .pp
 2014-07-03 12:49:04 -06:00
Joseph Hall
2e090cfb18 File extension should be .p, not .pp 2014-07-03 11:28:29 -06:00
Mathieu Le Marec - Pasquet
15c6aa829c tls additions: 
- cacert_path can be customized more easily
    - add a new get_ca function to get the cacert path or content
 2014-07-03 19:24:21 +02:00
Samuel Smith
b139f9a160 Merge pull request #13967 from SmithSamuelM/sam_raet_50 
Now using new raet.nacling.uuid function to generate the yard names this...
 2014-07-03 10:47:53 -06:00
Samuel M Smith
c6e3775e1a Now using new raet.nacling.uuid function to generate the yard names this should prevent 
any race conditions in yard names that were occuring with the old way of using gen_jid which was only microsecond rsolution
and therefore might generate two yards with the same name.

Needs RAET v 0.1.01
 2014-07-03 10:39:55 -06:00
Nitin Madhok
36f164db21 Adding test ability in pull, push and built state functions 2014-07-03 11:55:25 -04:00
Joseph Hall
afba55e3b4 Merge pull request #13955 from terminalmage/docs 
Add reactor example for updating fileserver on git push
 2014-07-02 20:12:56 -06:00
Erik Johnson
1b1eb26587 Add reactor example for updating fileserver on git push 2014-07-02 21:03:09 -05:00
Thomas S Hatch
07f55489b8 Merge pull request #13942 from cachedout/call_test_fix 
Fix broken test.
 2014-07-02 17:10:16 -06:00
Thomas S Hatch
e1ed7a0eee Merge pull request #13939 from nmadhok/fix-pylint 
Fixing lint
 2014-07-02 17:09:24 -06:00
Thomas S Hatch
f9dc61b8be Merge pull request #13936 from cachedout/mine_raet 
Mine over raet
 2014-07-02 17:08:15 -06:00
Colton Myers
b3331dfa91 Merge pull request #13950 from basepi/2014.1.6release 
Add newest cherry-pick to 2014.1.6 release notes
 2014-07-02 16:39:09 -06:00
Colton Myers
9537ada5d2 Add newest cherry-pick to 2014.1.6 release notes 2014-07-02 16:38:40 -06:00
Colton Myers
2d32d54407 Merge pull request #13948 from basepi/filedirctorydoc13866 
Improve file.directory documentation around `recurse`
 2014-07-02 16:06:03 -06:00