Samuel Smith
1032ba58f7
Merge pull request #14042 from SmithSamuelM/sam_raet_50
...
clean up behavior now cleans up stale uxd socket files
2014-07-08 20:52:15 -06:00
Samuel M Smith
3702936563
Merge remote-tracking branch 'upstream/develop' into sam_raet_50
2014-07-08 20:50:25 -06:00
Samuel M Smith
d2c9795ada
Refactored cleanup behavior so now it cleans up stale uxd socket files
2014-07-08 20:49:26 -06:00
Samuel Smith
38eeebb596
Merge pull request #14041 from SmithSamuelM/sam_raet_50
...
Salt Raet with support for new raet v0.2.00 with ephemeral Lane Yards
2014-07-08 20:14:11 -06:00
Samuel M Smith
7fa60cee9a
Merge remote-tracking branch 'upstream/develop' into sam_raet_50
2014-07-08 20:12:19 -06:00
Samuel M Smith
66a349e64d
Consistent worker yard names
2014-07-08 20:11:03 -06:00
Thomas S Hatch
946d54ebe4
Merge pull request #14037 from rallytime/schedule_tests
...
Fix KeyError in schedule.delete and more schedule unit tests
2014-07-08 20:09:37 -06:00
Thomas S Hatch
37a14bf37c
Merge pull request #14039 from terminalmage/fix-gitfs-tests
...
Fix gitfs tests
2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6
Fix gitfs tests
...
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:
https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object
Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
2014-07-08 18:56:12 -06:00
Pedro Algarvio
ebfb47b2da
Merge pull request #14038 from pass-by-value/skip_tests_if_no_network
...
Skip tests if no internet connection
2014-07-09 00:35:54 +01:00
Aditya Kulkarni
edfabad5e2
Skip tests if no internet connection
2014-07-08 17:16:47 -06:00
rallytime
7942350a65
Fix where=None bug
2014-07-08 16:58:19 -06:00
Thomas S Hatch
26d039d513
fix git pillar tests
2014-07-08 16:48:26 -06:00
Thomas S Hatch
f22d5e519c
lint
2014-07-08 16:15:00 -06:00
Thomas S Hatch
fee4aa7c15
Merge pull request #14035 from cachedout/12655
...
Don't use generic timeout, instead check for returned minions.
2014-07-08 16:13:43 -06:00
rallytime
562a7e51e2
Reformat changes to schedule.reload
2014-07-08 15:57:26 -06:00
rallytime
0a7b58652b
Fix potential KeyError in schedule.delete and more unit tests
2014-07-08 15:54:30 -06:00
Thomas S Hatch
4f293ef11f
Make the roster loader top class accept explicit backends
2014-07-08 15:39:09 -06:00
Erik Johnson
ffa9a49ed9
Merge pull request #14031 from techhat/cloud
...
Allow multiple instances to be spun up at once
2014-07-08 15:36:32 -06:00
Samuel M Smith
9cae846b68
updated
2014-07-08 15:18:46 -06:00
Samuel M Smith
995813d535
Merge branch 'sam_raet_50' into ephemeral
...
Conflicts:
salt/daemons/flo/core.py
2014-07-08 15:17:09 -06:00
Mike Place
62e9faa6b8
Refine publish.publish timeout
2014-07-08 14:52:48 -06:00
Joseph Hall
0c39b84e70
Fix function call check
2014-07-08 14:51:28 -06:00
Samuel Smith
46d01b11f8
Merge pull request #14034 from SmithSamuelM/sam_raet_50
...
Added support for raet UDP RoadStack rxMsgs Queue format change
2014-07-08 14:24:35 -06:00
Samuel M Smith
7bddcddf63
Merge remote-tracking branch 'upstream/develop' into sam_raet_50
2014-07-08 14:20:40 -06:00
Samuel M Smith
e33ac7362b
Added support for duple on rxMsgs queue for UDP stack
2014-07-08 14:19:49 -06:00
Thomas S Hatch
b7a6200708
Merge pull request #14027 from pass-by-value/ext_pillar_12647
...
Make sure multiple git pillar sources work
2014-07-08 13:41:38 -06:00
Samuel M Smith
034ba7639d
changed to ephemeral yard raet
2014-07-08 12:37:44 -06:00
Thomas S Hatch
ba90c0b22e
Merge pull request #14030 from rallytime/schedule_tests
...
More scheduler unit tests and fixed keyerror possibility
2014-07-08 12:27:23 -06:00
Thomas S Hatch
72986ffb59
Merge pull request #14029 from cachedout/7031
...
Catch exception in portage_config
2014-07-08 12:26:51 -06:00
Thomas S Hatch
a0db2caeb9
Merge pull request #14028 from nmadhok/improve-state-docs
...
Improving state docs
2014-07-08 12:23:43 -06:00
Joseph Hall
780e852649
Further optimize _get_node()
2014-07-08 12:23:02 -06:00
Thomas S Hatch
f0724b3b41
Use salt.utils.process.clean_proc instead of the one in master.py
...
We need to clean up the master.py clean_proc so we only use one
2014-07-08 12:18:24 -06:00
rallytime
a3c1d0e320
A few more tests for enabling and disabling jobs
2014-07-08 12:00:08 -06:00
Joseph Hall
e44bd86f5c
Add a warning about experimental code
2014-07-08 11:55:04 -06:00
Joseph Hall
f157c035e9
Allow multiple instances to be spun up at once
2014-07-08 11:52:39 -06:00
rallytime
5ad8bb8f01
Update test docstrings
2014-07-08 11:38:16 -06:00
Nitin Madhok
c80de9e5cb
Improving docs for salt.states.mysql_grants
2014-07-08 13:31:50 -04:00
rallytime
cf11ca22d0
More scheduler unit tests and fixed keyerror possibility
2014-07-08 11:27:32 -06:00
Nitin Madhok
ada23d6422
Improving docs for salt.states.mount
2014-07-08 13:09:26 -04:00
Thomas S Hatch
cec3b71840
Merge pull request #14026 from cachedout/gpg_bin_check
...
Check for gpg binary
2014-07-08 11:01:23 -06:00
Nitin Madhok
869e80c0a5
Fixing pylint
2014-07-08 12:59:23 -04:00
Aditya Kulkarni
a7b52855d3
Make sure multiple git pillar sources work
2014-07-08 10:58:31 -06:00
Nitin Madhok
51bea3c8b0
Improving docs for salt.states.makeconf
2014-07-08 12:57:49 -04:00
Nitin Madhok
fef51d34ef
Improving docs for salt.states.locale
2014-07-08 12:52:06 -04:00
Nitin Madhok
27dce85a90
Improving docs for salt.states.libvirt
2014-07-08 12:47:34 -04:00
Nitin Madhok
f326724eec
Improving docs for salt.states.kmod
2014-07-08 12:46:40 -04:00
Mike Place
0f46a12e0f
Catch exception in portage_config
2014-07-08 10:45:27 -06:00
Nitin Madhok
3ae20d5190
Improving docs for salt.states.iptables
2014-07-08 12:44:39 -04:00
Nitin Madhok
f5a0ecf04a
Improving docs for salt.states.incron
2014-07-08 12:41:43 -04:00
