Erik Johnson
0b6db66aaa
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-02 22:38:44 -05:00
Erik Johnson
d6abc8c71e
Merge pull request #14698 from hemebond/2014.7
...
Quote paths passed to patch. Fixes #14536 .
2014-08-02 22:37:35 -05:00
James O'Neill
828286880d
Quote paths passed to patch. Fixes #14536 .
2014-08-03 14:46:25 +12:00
Vye Wilson
80b50c8646
Fixes #14646 , presence event name typo.
2014-08-02 19:35:25 -07:00
Jonathan Frank
a46dcbc678
GlusterFS - Added the functionnality to add new bricks to an existing volume
2014-08-02 21:18:40 -04:00
Pedro Algarvio
905b9a18b7
Merge pull request #14686 from whiteinge/test-gh-order
...
Couple o' documentation fixes
2014-08-03 00:48:56 +01:00
Elias Probst
686236d650
Corrected typo (Verion → Version).
2014-08-03 00:46:44 +01:00
Pedro Algarvio
0780ba4b44
Merge pull request #14693 from eliasp/typo-verion-version
...
Corrected typo (Verion → Version).
2014-08-03 00:45:02 +01:00
Pedro Algarvio
c3665de8f9
Merge pull request #14692 from techhat/cheetah
...
Adding Template renderer for Cheetah
2014-08-03 00:44:20 +01:00
Alexandre Garnier
c6699d9901
Improve user.getent on Windows
...
- Call `user.list_users` instead of duplicating the behavior
- Get 'uid' directly from `user.version` result
2014-08-02 16:58:10 +02:00
Alexandre Garnier
94263119ef
Improve user.info output on Windows
...
- Add 'uid' information
- Use it to get userprofile from registry
- Fallback 'home' to 'profile' if not set
2014-08-02 16:58:10 +02:00
Alexandre Garnier
c4e99e99fa
Use win32 API to get user info in user.info
...
Issue #14679 : Calling `net user <name>` and parsing it is broken
on non-English Windows because the output is i18nized.
2014-08-02 16:58:02 +02:00
Alexandre Garnier
ac6008d583
Simplify user.list_users on Windows
...
- 'None' is simplier than 'localhost' and coherent with `module.win_file`
- Level 0 is enough as we just need the username
- Remove useless log
2014-08-02 16:07:57 +02:00
Elias Probst
7e5a9a7ed8
Corrected typo (Verion → Version).
2014-08-02 11:04:30 +02:00
Joseph Hall
faeba57e01
Adding Template renderer for Cheetah
2014-08-02 00:31:49 -06:00
Erik Johnson
6be96f82a6
Merge branch '2014.7' into develop
2014-08-01 22:51:22 -05:00
Erik Johnson
3cd20286e7
Revert "prevent gitfs.py changing load variable that is used by other fs modules too"
...
This reverts commit 852571056ehttps://github.com/saltstack/salt/pull/14594#issuecomment-50952929 for
more info.
2014-08-01 22:49:34 -05:00
Thomas Jackson
0ce353ddfb
Add master_id to master docs
2014-08-01 16:38:22 -07:00
Thomas Jackson
abc9985e50
Pep8 cleanup
2014-08-01 16:38:00 -07:00
Thomas Jackson
5754314d67
Make backoff use acceptance_wait_time
2014-08-01 16:38:00 -07:00
Thomas Jackson
081708e3d6
More code cleanup, wrap all the calls to syndics in _call_syndic
2014-08-01 16:38:00 -07:00
Thomas Jackson
ccca1f1bb5
Add hard coded timeout for syndic being dead
2014-08-01 16:38:00 -07:00
Thomas Jackson
c8961fe792
Major re-work to look more like MultiMinion
2014-08-01 16:37:59 -07:00
Thomas Jackson
72a1287493
pep8
2014-08-01 16:37:59 -07:00
Thomas Jackson
d9d45dd0b8
Update notes
2014-08-01 16:37:59 -07:00
Thomas Jackson
6805d2b2cf
Handle failures of upstream masters
2014-08-01 16:37:59 -07:00
Thomas Jackson
f226809cd5
Basics working, can't handle restart of a master yet...
2014-08-01 16:37:59 -07:00
Thomas Jackson
2b8c106108
Add master_id to pub/ret data as ground work for multi_syndic
2014-08-01 16:37:59 -07:00
Pedro Algarvio
d971892556
Merge pull request #14680 from techhat/genshi
...
Add Genshi template rendering
2014-08-02 00:18:14 +01:00
Colton Myers
ac8ce788c2
Merge branch '2014.7' into develop
2014-08-01 16:10:50 -06:00
Colton Myers
35ca1b890e
Backport #14684 to 2014.7
2014-08-01 16:10:22 -06:00
Joseph Hall
bcdc5ce5bb
Add filter type to state_output
2014-08-01 16:09:25 -06:00
Colton Myers
ed0421d87d
Merge pull request #14684 from techhat/outputfilter
...
Add filter type to state_output
2014-08-01 16:08:24 -06:00
Joseph Hall
c6718d0200
Oof, forgot to clean up copy/paste
2014-08-01 13:50:54 -06:00
xzy3
e0d67f649e
Fixed attrerror in _threaded_return cased when execution modules yield
...
more than one dict object.
/var/log/salt/minion:
[salt.minion ][WARNING ] The minion
function caused an exception
Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/salt/minion.py", line 803, in
_thread_return
iret.update(single)
2014-08-01 15:36:10 -04:00
Pedro Algarvio
1f962f4691
Merge branch '2014.7' into develop
2014-08-01 20:19:10 +01:00
Pedro Algarvio
ecc9ce4f35
sdist must also generate and include salt/_version.py
2014-08-01 20:18:01 +01:00
Colton Myers
0143275458
Merge branch '2014.7' into develop
2014-08-01 12:36:57 -06:00
Colton Myers
051e371fe8
Add release notes for 2014.1.10
2014-08-01 12:36:10 -06:00
Seth House
ab508cb9d3
Fix maxdepth TOC for Salt at Scale tutorials
2014-08-01 12:05:22 -06:00
Seth House
cc4fced667
Added missing code-block to redis returner docs
2014-08-01 12:05:22 -06:00
Colton Myers
0307fdbe9a
Merge branch '2014.7' into develop
...
Conflicts:
salt/runners/manage.py
2014-08-01 10:52:52 -06:00
Colton Myers
114d9a3489
Backport #14674 to 2014.7
2014-08-01 10:52:12 -06:00
Colton Myers
a2ae8f9217
Deprecate the prep_install option for seed.apply_
2014-08-01 10:52:03 -06:00
Joseph Hall
96acb97780
Add filter type to state_output
2014-08-01 07:22:47 -06:00
Elias Probst
30d77cf84c
Also validate 'defaults' in states.file.managed
2014-08-01 14:59:05 +02:00
Chris Fane
41136b0f29
Added source for jsonpickle dependency, and support for resilient elasticseach clusters via multiple hosts.
2014-08-01 12:50:35 +01:00
Joseph Hall
80e5d8e60f
Add Genshi template rendering
2014-08-01 04:11:42 -06:00
Joseph Hall
88c1d37598
Merge pull request #14678 from hvnsweeting/fix-doc-halite
...
fix link scheme, default scheme is HTTPS, as used sample configs
2014-08-01 03:01:38 -06:00
Hung Nguyen Viet
415623a9c6
fix link scheme, default scheme is HTTPS, as used sample configs
...
provided by the tut
2014-08-01 15:56:58 +07:00
