Commit Graph

58985 Commits

Author SHA1 Message Date
Eren Güven
e71e9ab07f fix show_diff for test run 2015-09-09 14:58:59 +02:00
Erik Johnson
d05e7b0875 Add information on winrepo cachedir name overrides 2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230 Remove block describing hashed winrepo cachedirs
The behavior has now changed so this information is inaccurate.
2015-09-09 05:44:15 -05:00
Erik Johnson
0c45781637 Don't clean old remotes by default
This keeps non-git repo definitions from being removed win the winrepo
remotes are updated, unless clean=True is explicitly passed.
2015-09-09 05:44:15 -05:00
Erik Johnson
0bd2848cb2 Add per-remote-only param support to salt.utils.gitfs
This allows us to have an optional "name" param to be used to override
the cachedir and allow human-readable winrepo cachedirs to be supported.
2015-09-09 05:44:15 -05:00
Erik Johnson
c3becf7886 Manually clear old remotes after fetching winrepo remotes 2015-09-08 22:27:30 -05:00
Erik Johnson
52dad42407 Rename PER_REMOTE_PARAMS to PER_REMOTE_OVERRIDES
With the addition of per-remote-only params, this change in naming
reduces ambiguity.
2015-09-08 22:03:49 -05:00
Justin Findlay
a604a1a289 Merge pull request #26969 from TheBigBear/patch-6
URL of salt windows downloads has changed
2015-09-08 16:23:28 -06:00
Justin Findlay
d87321361d Merge pull request #26968 from TheBigBear/patch-5
URL of salt windows downloads has changed
2015-09-08 16:23:02 -06:00
Justin Findlay
602559f3a9 Merge pull request #26966 from TheBigBear/patch-3
URL has changed
2015-09-08 16:21:27 -06:00
Mike Place
8b6a7b0d65 Revert "better path query parsing in fileserver"
This reverts commit 29a023aaad.

This causes breakage outlined in #26839
2015-09-08 14:47:50 -06:00
TheBigBear
21ea2f6b1b URL of salt windows downloads has changed 2015-09-08 21:43:59 +01:00
TheBigBear
febbdfdf46 URL of salt windows downloads has changed 2015-09-08 21:39:37 +01:00
TheBigBear
8d2c042cf7 new URL for windows salt downloads
the old site stil exists, and looks almost up to date but am pretty sure all the really up to date and relevant stuff is (or should be!) now at https://repo.saltstack.com/windows/

I am also chanigng this from http to https, hope this has not undesireable side-effects?

Shouldn't the old docs.saltstack.com/windows directory be removed now?
2015-09-08 21:37:15 +01:00
TheBigBear
c1e39a15d7 URL has changed
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-08 21:21:17 +01:00
Rene Fragoso
00c076a7ed Fix pylint warnings: unnecessary parens after if keyword 2015-09-08 14:22:25 -04:00
Rene Fragoso
ce6ae697f1 Add --state-verbose command line option to salt cmd
This overrides the state_verbose setting that may be set in master config.

If master has state_verbose set to True

--state-verbose=False would suppress states that didn't change.

If master config has state_verbose set to False

--state-verbose=True would still show states that didn't have changes.

Below is test output with state_verbose=True in ./etc/salt/master:

```
$ salt -c ./etc/salt '*' --state-verbose=True  state.highstate
salt-dev:
----------
          ID: test_file.txt
    Function: file.managed
        Name: /tmp/test_file.txt
      Result: True
     Comment: File /tmp/test_file.txt exists with proper permissions. No changes made.
     Started: 13:51:15.798599
    Duration: 7.176 ms
     Changes:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   7.176 ms

$ salt -c ./etc/salt '*' --state-verbose=False  state.highstate
salt-dev:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   8.589 ms
```
2015-09-08 13:48:24 -04:00
Pedro Algarvio
b45d0b2a21 Merge pull request #26958 from s0undt3ch/bradthurber-bootstrap-command-line-help-doc-update
Bradthurber bootstrap command line help doc update
2015-09-08 18:12:38 +01:00
Mike Place
24eec1babb Merge pull request #26949 from rallytime/bp-25148
Back-port #25148 to 2015.8
2015-09-08 11:10:08 -06:00
Bo Maryniuk
721f9e601c Convert time to ISO 8601 2015-09-08 19:04:54 +02:00
Pedro Algarvio
3ad48ca58e Merge pull request #26957 from s0undt3ch/develop
Allow DictItem and ArrayItem to only have the additional items/properties set
2015-09-08 17:47:46 +01:00
Bo Maryniuk
6bd5047b1e Return a detailed information about package(s) 2015-09-08 18:47:01 +02:00
Pedro Algarvio
28069faffb Remove the /etc/salt prefix
Closes #26890
2015-09-08 17:26:48 +01:00
Pedro Algarvio
c586e43f63 Merge branch 'bootstrap-command-line-help-doc-update' of https://github.com/bradthurber/salt into bradthurber-bootstrap-command-line-help-doc-update 2015-09-08 17:13:47 +01:00
Pedro Algarvio
cfe138911d Allow DictItem and ArrayItem to only have the additional items/properties set 2015-09-08 17:05:21 +01:00
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
Thomas Jackson
795d8f022c AsyncPillar wrapper to fix file_client: local minions
Fixes #24440
2015-09-08 08:33:05 -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
Michael Steed
bc041fa4a7 Merge branch 'issue-23125' of github.com:msteed/salt into issue-23125 2015-09-07 16:06:01 -06:00
Michael Steed
593c4d6b2f issue-23125
Initial effort at making elasticsearch work as master job cache.
2015-09-07 16:05:28 -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
Paul Morelle
08dbe85c57 aptpkg.mod_repo: Raise when key_url doesn't exist
_cmd_quote would raise with unexplicit error if _fn = False
2015-09-05 11:55:20 +02:00
Michael Steed
9aedc2662e issue-23125
Initial effort at making elasticsearch work as master job cache. Not
working yet.
2015-09-04 19:07:04 -06:00
Nathan Grennan
c755a1ab9f Adding extra command line arguments only for dnf install to allow upgrades. 2015-09-04 15:04:38 -07:00
rallytime
bf33c99b08 Remove redundant parentheses 2015-09-04 15:58:16 -06:00
Jeremy Rosenbaum
77daaa31ea remove extra call to time_auth 2015-09-04 14:57:18 -07:00
rallytime
5045989be7 Make sure function names comply 2015-09-04 15:42:13 -06:00
rallytime
e327d9a8a4 Remove redundant parens 2015-09-04 15:10:28 -06:00
rallytime
eee0291ff8 Code clean up of cloud drivers and files
Sonar Cube!
2015-09-04 14:59:55 -06:00
Erik Johnson
28e07d5d06 Get rid of error in legacy git pillar when using branch mapping notation
This doesn't fix the problem of the branch not being mapped to the
specified branch, and this code is not going to be maintained going
forward (in favor of the gitfs-backed git_pillar code), but this will at
least prevent the branch from failing to checkout.
2015-09-04 15:19:58 -05: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