Commit graph

32010 commits

Author SHA1 Message Date
Pedro Algarvio
b5b51fc7ed Partially revert "Differentiate ZeroMQ from RAET based installations."
This partially reverts commit e4179cdc68.
2014-06-17 23:56:05 +01:00
Thomas S Hatch
874c0f6eec Fix the channel to fail after the timeout and tries 2014-06-17 16:22:10 -06:00
Colton Myers
6c66ae536d Merge pull request #13518 from basepi/iptablesfix
Fix undefined variable in iptables module
2014-06-17 15:00:37 -06:00
Thomas S Hatch
3619312fd7 Dont' remove salt level keys with remote cache tracking 2014-06-17 14:55:00 -06:00
Colton Myers
2c23106356 Fix undefined variable in iptables 2014-06-17 14:54:03 -06:00
Seth House
25bc1c5c31 Merge pull request #13516 from christabor/develop
Fixed css fonts:
2014-06-17 14:50:57 -06:00
Christobot
3d4484d24a Fixed css fonts:
The path was referenced after the css macro, and the css font names have
changed as well. I update all the weights and styles and fixed some
formatting/indenting issues
2014-06-17 13:39:31 -07:00
Colton Myers
43cd6d7307 Merge pull request #13512 from rallytime/cloud_extends_fix
Bugfix to allow cloud provider extend functionality
2014-06-17 14:20:58 -06:00
Thomas S Hatch
82c8440f09 Merge pull request #13511 from cachedout/more_gitfs_fix
Create gitfs cache dir if does not exist
2014-06-17 13:58:45 -06:00
Thomas S Hatch
b40757950c Merge pull request #13505 from s0undt3ch/hotfix/setup-raet
Differentiate ZeroMQ from RAET based installations
2014-06-17 13:53:43 -06:00
Joseph Hall
ab959c1fd0 Merge pull request #13514 from terminalmage/docs
Remove italics
2014-06-17 13:52:48 -06:00
Erik Johnson
1a4e1c7944 Remove italics
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
2014-06-17 14:47:19 -05:00
Seth House
68904637a5 Merge pull request #13509 from bechtoldt/foreman_pillar_doc
trying to add foreman pillar module to documentation, refs #13481
2014-06-17 13:17:57 -06:00
rallytime
0ebc185da0 Bugfix to allow cloud provider extend functionality 2014-06-17 12:55:03 -06:00
Mike Place
c4f5298d62 Create gitfs cache dir if does not exist
Should fix test suite
2014-06-17 12:04:53 -06:00
Arnold Bechtoldt
9a5ce71286 trying to add foreman pillar module to documentation, refs #13481 2014-06-17 19:24:27 +02:00
Thomas S Hatch
818e23e6df Merge pull request #13503 from khrisrichardson/state_service_mod_watch
revises #13479 service.dead else leg uses empty string
2014-06-17 11:19:22 -06:00
Thomas S Hatch
07e104c7c1 Merge pull request #13502 from cowyn/fix-autoreject_file-path
Provide a reasonable sample path for autoreject_file without confusion
2014-06-17 11:18:47 -06:00
Thomas S Hatch
f93ef3d6ba Merge pull request #13498 from makinacorpus/hardcrash
Make scripts hardcrashable
2014-06-17 11:16:45 -06:00
Thomas S Hatch
1ce148a2c7 Merge pull request #13495 from s0undt3ch/hotfix/jenkins-lxc
new generation jenkins script
2014-06-17 11:14:53 -06:00
Thomas S Hatch
2c23bcd1df Merge pull request #13493 from fessoga5/develop
Change module debian_ip.py for support PPPoE.
2014-06-17 11:13:41 -06:00
Pedro Algarvio
4ba108a0d7 Also provide a pip example on how to pass the global variable 2014-06-17 16:01:11 +01:00
Pedro Algarvio
a2c8175181 Document the --salt-transport option 2014-06-17 15:53:29 +01:00
Pedro Algarvio
85427e73d7 Update install documentation to reflect RAET deps 2014-06-17 15:36:02 +01:00
Pedro Algarvio
e4179cdc68 Differentiate ZeroMQ from RAET based installations.
Since the requirements are different, "decide" which to require.
2014-06-17 15:36:02 +01:00
Pedro Algarvio
abe20a61d9 Strip white-space 2014-06-17 15:36:01 +01:00
Mathieu Le Marec - Pasquet
8a832d8ead do not loose stack trace on hardcrashing 2014-06-17 15:01:56 +02:00
Joseph Hall
e652e8bf7d Merge pull request #13497 from s0undt3ch/develop
White-space lint fix
2014-06-17 06:05:20 -06:00
Joseph Hall
7fbd140bdb Merge pull request #13500 from krallin/patch-1
Fix typo in etcd pillar documentation
2014-06-17 05:59:45 -06:00
Khris Richardson
128cbfafe4 revises #13479 service.dead else leg uses empty string 2014-06-17 06:12:40 -05:00
Cowyn Li
9436dbd84c Provide a reasonable sample path for autoreject_file without confusion 2014-06-17 19:01:31 +08:00
Mathieu Le Marec - Pasquet
2fae73e82a Make scripts hardcrashable 2014-06-17 12:39:31 +02:00
Thomas Orozco
c10caa1d52 Fix typo in etcd pillar documentation 2014-06-17 12:32:03 +02:00
Pedro Algarvio
3c0753c35c White-space lint fix 2014-06-17 10:04:32 +01:00
Pedro Algarvio
69e9f14f39 Cleanup header 2014-06-17 09:57:23 +01:00
Pedro Algarvio
becc4dc08a Update Jenkins script to latest develop 2014-06-17 09:56:25 +01:00
Pedro Algarvio
700dc02491 jenkins.py should remain equal to the develop branch 2014-06-17 09:56:05 +01:00
Pedro Algarvio
2809d68e11 Allow passing which transport to use when testing 2014-06-17 09:56:05 +01:00
Pedro Algarvio
cd37a4b2be Fix header 2014-06-17 09:56:05 +01:00
Pedro Algarvio
fd0b301a34 Remove extra white-sapce 2014-06-17 09:56:05 +01:00
Pedro Algarvio
107ca41d9b LXC requires a deployment host 2014-06-17 09:56:04 +01:00
Pedro Algarvio
1d465f4af7 Double quote YAML 2014-06-17 09:56:04 +01:00
Pedro Algarvio
3226a08ea1 peer needs arg as a YAML string 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec1c278168 Reset cloud to False if LXC is chosen 2014-06-17 09:56:04 +01:00
Pedro Algarvio
9ecc03b018 Drop SSH runtests execution but keep SCP file copying. 2014-06-17 09:56:04 +01:00
Pedro Algarvio
97ae4aa19c Error on SSH use 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec486bfd1b Force fake tty's and explicit exits! 2014-06-17 09:56:03 +01:00
Pedro Algarvio
b3a4553bcb Fix unit tests XML files download 2014-06-17 09:56:03 +01:00
Pedro Algarvio
f1b5ed761a Minor reordering 2014-06-17 09:56:03 +01:00
Pedro Algarvio
10643602c4 Allow matching tagged versions 2014-06-17 09:56:03 +01:00