Joseph Hall
|
f3e4fe5440
|
Merge pull request #14700 from gtmanfred/develop
document the usage of userdata for cloud-init
|
2014-08-03 14:53:27 -06:00 |
|
Daniel Wallace
|
77eaca180a
|
document the usage of userdata for cloud-init
closes #14643
|
2014-08-03 13:38:38 -05:00 |
|
Erik Johnson
|
1f3bfa6b9d
|
Merge remote-tracking branch 'upstream/2014.7' into develop
|
2014-08-02 22:40:40 -05:00 |
|
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 |
|
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 |
|
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 852571056e. See
https://github.com/saltstack/salt/pull/14594#issuecomment-50952929 for
more info.
|
2014-08-01 22:49:34 -05: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 |
|
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 |
|
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 |
|
Joseph Hall
|
61dffacc20
|
Merge pull request #14675 from rallytime/pylint_fix
Fixes #14555
|
2014-07-31 23:18:43 -06:00 |
|
rallytime
|
92e802040f
|
Remove extra line to fix manage.py pylint error
|
2014-07-31 22:56:20 -06:00 |
|
Nicole Thomas
|
a4d5cd9602
|
Merge pull request #14674 from basepi/seedlint
Deprecate the prep_install option for seed.apply_
|
2014-07-31 22:42:10 -06:00 |
|
Erik Johnson
|
37124b91e1
|
Merge pull request #14676 from rallytime/fix_str_format
Fixes #14559
|
2014-07-31 22:02:37 -05:00 |
|
rallytime
|
9e66bf1e72
|
Fixes #14559
|
2014-07-31 17:48:28 -06:00 |
|
rallytime
|
7c6d15eca2
|
Fixes #14555
Fixed plylint error in `salt.utils.schedule.py`
|
2014-07-31 17:22:42 -06:00 |
|
Colton Myers
|
9460b5b165
|
Deprecate the prep_install option for seed.apply_
|
2014-07-31 17:12:19 -06:00 |
|
Erik Johnson
|
65a655d2f2
|
Merge branch 'pyobjects-rel-note' into 2014.7
|
2014-07-31 18:07:20 -05:00 |
|
Evan Borgstrom
|
c892cfad8a
|
Adding Pyobjects section to the release notes for 2014.7.0
|
2014-07-31 18:06:05 -05:00 |
|
Erik Johnson
|
b454e39953
|
Merge pull request #14663 from borgstrom/pyobjects-rel-note
Adding Pyobjects section to the release notes for 2014.7.0
|
2014-07-31 18:02:21 -05:00 |
|
Colton Myers
|
2f2d05b6c9
|
Merge pull request #14669 from rallytime/pylint_fix_develop
Fix pylint errors
|
2014-07-31 16:45:30 -06:00 |
|
Colton Myers
|
2bfcbe01d0
|
Merge pull request #14661 from rallytime/fix_rhel7_test
Add GPG key file to integration tests
|
2014-07-31 16:34:47 -06:00 |
|
Colton Myers
|
2484db8795
|
Merge pull request #14665 from rallytime/fix_augeas_import
Fixed augeas import
|
2014-07-31 16:31:33 -06:00 |
|
Colton Myers
|
4ce4fef541
|
Merge branch '2014.7' into develop
|
2014-07-31 16:27:28 -06:00 |
|
Colton Myers
|
0fec4db458
|
Backport #14488 to 2014.7
|
2014-07-31 16:27:14 -06:00 |
|
Nitin Madhok
|
140aea74a1
|
Change the error message to show actually what's tested
|
2014-07-31 16:25:29 -06:00 |
|
Nitin Madhok
|
2aec676bd8
|
Removing trailing whitespace
|
2014-07-31 16:25:29 -06:00 |
|