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

17047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
0e45b1d636 Merge pull request #6890 from s0undt3ch/features/improve-packaging 
Improve packaging - No more hardcoded internal paths
 2013-08-26 10:20:47 -07:00
Thomas S Hatch
3016957349 Merge pull request #6899 from s0undt3ch/hotfix/mock-not-available 
Allow tests to be properly skipped if `mock` is not installed
 2013-08-26 10:14:23 -07:00
Thomas S Hatch
4b34b30486 Merge pull request #6902 from hvnsweeting/fix_overstate 
wrap match name in quote to make sure it work
 2013-08-26 10:13:31 -07:00
Pedro Algarvio
456360dc32 Fix test expected output plus an additional one for pip git install. 2013-08-26 17:05:47 +00:00
Pedro Algarvio
6e694791fb Allow tests to be properly skipped if mock is not installed. 2013-08-26 17:05:44 +00:00
hvnsweeting
0091937b3d wrap match name in quote to make sure it work 2013-08-27 00:04:44 +07:00
Thomas S Hatch
609bdc2833 Merge pull request #6838 from dlanderson/master_util 
Add salt.utils.master with class MasterPillarUtil. Change salt.runners.c...
 2013-08-26 09:51:32 -07:00
Thomas S Hatch
4f3e089f40 Merge pull request #6901 from terminalmage/gitfs-fixes 
Gitfs fixes
 2013-08-26 09:35:56 -07:00
Erik Johnson
b8eb2e35f2 Fix exception while fetching new gitfs remotes 
This fixes a bug caused by one of GitPython's innumerable asserts failing
upon fetching a new remote, causing an exception which interrupts the
fileserver update.
 2013-08-26 11:29:47 -05:00
Erik Johnson
f6b240aaef Fix error when gitfs file hash does not yet exist 
This repeats the fix done in 46d58dc for the gitfs backend.
 2013-08-26 11:28:33 -05:00
Thomas S Hatch
afd41a54be Merge pull request #6897 from s0undt3ch/features/salttesting-mock 
Use salttesting.mock which allows for cleaner tests skip if mock is not available.
 2013-08-26 09:25:50 -07:00
Thomas S Hatch
a53e730209 Merge pull request #6900 from SmithSamuelM/develop 
Removed else clause in handling of SUB_EVENTS. According to Tom it served no purpose.
 2013-08-26 09:25:14 -07:00
Samuel M Smith
eee4077344 Fix removed else clause. Tom saw no reason to have it 
<<<<<<< HEAD
=======
            else:
                            self.fire_event(load, load['fun'])  # old dup event
                                            self.fire_event(load,
                                                                            tagify([load['jid'],
                                                                                                                    'sub',
                                                                                                                                                            load['id'],
                                                                                                                                                                                                    'ret',
                                                                                                                                                                                                                                            load['fun']],
                                                                                                                                                                                                                                                                                   'job'))
                                                                                                                                                                                                                                                                                   >>>>>>> upstream/develop

Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	salt/utils/event.py
 2013-08-26 10:17:30 -06:00
Samuel M Smith
0a8fdb6b28 removed else clause on SUB_EVENT processing 2013-08-26 10:15:30 -06:00
Pedro Algarvio
57a69f1ff8 Adapted integration.modules.django to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
6d06e12e22 Adapted integration.modules.cmdmod to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
5d26a9fd4b Adapted unit.states.rvm_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
23fa44ff58 Adapted unit.states.pip_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
8f44dec13e Adapted unit.states.gem_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
ef29861ff3 Adapted unit.states.file_test to use salttesting.mock 2013-08-26 13:03:07 +00:00
Pedro Algarvio
2eab51a429 Adapted unit.utils.warnings_test to use salttesting.mock 2013-08-26 13:03:04 +00:00
Pedro Algarvio
296c83be1f Adapted unit.pillar_test to use salttesting.mock 2013-08-26 13:01:02 +00:00
Pedro Algarvio
91fa38aea2 Adapted unit.payload_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
d33415c73a Adapted unit.modules.rvm_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
220aa48e24 Adapted unit.modules.poptgres_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
6bc17f0c1b Adapted unit.modules.pip_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
64d20afec9 Adapted unit.modules.gem_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
2acd67bc59 Adapted unit.modules.archive_test to use salttesting.mock 2013-08-26 13:00:07 +00:00
Pedro Algarvio
8646fcb012 Adapted unit.modules.win_status_test to use salttesting.mock 2013-08-26 12:59:15 +00:00
Pedro Algarvio
fe0d7dc048 Adapted unit.modules.alternatives_test to use salttesting.mock 2013-08-26 12:59:12 +00:00
Pedro Algarvio
371f08a959 Adapted unit.modules.virtualenv to use salttesting.mock 2013-08-26 12:58:04 +00:00
Pedro Algarvio
c1af8895b6 Remove more trailing white-space. 2013-08-26 12:48:20 +00:00
Pedro Algarvio
ac3fcb9314 Merge pull request #6898 from vlcinsky/develop 
module.pip: added doc for new option "use_wheel"
 2013-08-26 04:55:43 -07:00
Jan Vlčinský
7900fae44f module.pip: added doc for new option "use_wheel" 
pip state and module got new option for pip>=1.4 called "use_wheel". State got properly updated doc for this change, but module not. This commit adds two lines of doc for pip module too.
 2013-08-26 13:14:02 +02:00
Pedro Algarvio
67dc1c4e7a Remove trailing white-space. 2013-08-26 07:12:05 +00:00
Erik Johnson
6a5f189188 Merge pull request #6892 from terminalmage/docs 
Audit module documentation (Q to R)
 2013-08-25 20:26:31 -07:00
Erik Johnson
6f332cdeff Audit module documentation (Q to R) 
This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
 2013-08-25 22:25:26 -05:00
Thomas S Hatch
d5b040b0de Merge pull request #6887 from GamingRobot/issue_6851 
Fixed service state comment text
 2013-08-25 20:19:13 -07:00
Pedro Algarvio
9a4ce0ea9d No more hard-coded salt paths. 
All system paths that salt expects and needs are all configurable at install time. This allows for packagers to setup salt's **default** internal paths at build time. For example, under windows, the configuration directory is expected at `c:\salt\conf\`, on FreeBSD at `/usr/local/etc/salt`, etc.

The configurable paths are:

* Salt root directory, `salt_root` in the master and minion configuration files, `--salt-root-dir` option to `python setup.py install`.  Default: `/`
* Salt configuration directory, `--salt-config-dir` option to `python setup.py install`.  Default: `/etc/salt`
* Salt cache directory, `--salt-cache-dir` option to `python setup.py install`.  Default: `/var/cache/salt`
* Salt sock directory, `--salt-sock-dir` option to `python setup.py install`.  Default: `/var/run/salt`
* Salt services root directory, `--salt-srv-root-dir` option to `python setup.py install`.  Default: `/srv`
* Salt base file roots directory, `--salt-base-file-roots-dir` option to `python setup.py install`.  Default: `/srv/salt`
* Salt base pillar roots directory, `--salt-base-pillar-roots-dir` option to `python setup.py install`.  Default: `/srv/pillar`
* Salt base master roots directory, `--salt-base-master-roots-dir` option to `python setup.py install`.  Default: `/srv/salt-master`
* Salt logs directory, `--salt-logs-dir` option to `python setup.py install`.  Default: `/var/log/salt`
* Salt pidfile directory, `--salt-pidfile-dir` option to `python setup.py install`.  Default: `/var/run`
 2013-08-25 22:55:57 +00:00
Pedro Algarvio
8e96adeb13 Minor formatting updates. 2013-08-25 22:16:20 +00:00
Pedro Algarvio
4a0eff9d36 Double to single quotes. 2013-08-25 21:53:41 +00:00
Erik Johnson
2b9da0e759 Fix tracebacks when prefix not specified. 
This fixes #6886 by accounting for instances where the prefix is not
specified, catching the KeyError exceptions.
 2013-08-25 12:37:12 -05:00
GamingRobot
dd6115869e fixed full -> fully 2013-08-25 10:17:26 -06:00
Pedro Algarvio
8ab65b2d47 Merge pull request #6884 from terminalmage/travis 
Fix boolean, plus other pep8 fixes
 2013-08-25 08:57:47 -07:00
GamingRobot
0048f9513e fixed service comment text 2013-08-25 08:20:37 -06:00
Joseph Hall
f064e2beba Merge pull request #6885 from lloydchang/develop 
Clarify OS X instructions toward success
 2013-08-25 04:48:48 -07:00
Lloyd Chang
54ad96538d Clarify OS X instructions toward success 2013-08-25 00:10:24 -07:00
Erik Johnson
f675c40970 Fix boolean, plus other pep8 fixes 
b9e7567b used "false" instead of "False", this fixes that.
 2013-08-24 23:37:02 -05:00
Erik Johnson
3d9ede7cd8 Merge pull request #6883 from terminalmage/docs 
Docs formatting fixes
 2013-08-24 21:21:35 -07:00
Erik Johnson
c4e85c63e9 Docs formatting fixes 2013-08-24 23:19:54 -05:00