valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,835 Commits 24 Branches 182 Tags 341 MiB
83bca6d429
Commit Graph

26835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
83bca6d429 Merge pull request #10854 from pengyao/ext_pillar 
example should use escape character
 2014-02-28 08:11:47 -07:00
Thomas S Hatch
5b8a84c963 Merge pull request #10848 from gtmanfred/develop 
[salt.cloud] key_filename is not always set for expanduser
 2014-02-28 08:03:59 -07:00
Mike Place
08bdcfae3d Merge pull request #10863 from topochan/patch-1 
Fix in nagios module for run_*_pillar
 2014-02-28 07:09:28 -07:00
Miguel Angel Guillén
b3a514ba5f Update nagios.py 2014-02-28 14:37:24 +01:00
Pedro Algarvio
1574ee1b15 Merge pull request #10853 from cachedout/brew_lint 
Pylint var name case
 2014-02-28 12:50:00 +00:00
Joseph Hall
53124953a0 Merge pull request #10858 from topochan/patch-1 
Cleanup run and run_all params in nagios module
 2014-02-28 04:24:31 -07:00
Joseph Hall
a45d67e2e8 Merge pull request #10856 from ticosax/docs-addon 
Docs addon
 2014-02-28 04:18:50 -07:00
Miguel Angel Guillén
5d0c8897cd Cleanup run and run_all params 2014-02-28 09:45:41 +01:00
Nicolas Delaby
3ea1ad0bc3 typo 2014-02-28 09:27:49 +01:00
Nicolas Delaby
2925e7618d add reference to htpasswd module in states index 2014-02-28 09:27:13 +01:00
pengyao
721ca2bf21 example should use escape character 
echo command will clear the quotation mark, should use escape character("\")
 2014-02-28 15:19:37 +08:00
Mike Place
5ce9c2cdf3 Pylint var names. 2014-02-28 00:05:03 -07:00
Mike Place
d39795dc3d Merge pull request #10847 from rallytime/brew_test 
Started writing brew unit tests
 2014-02-27 23:30:39 -07:00
Mike Place
a81562b60a Merge pull request #10849 from whiteinge/doc-glossary-links 
Added links from glossary entries
 2014-02-27 22:49:38 -07:00
rallytime
48e3f718ff pylint fixes 2014-02-27 21:33:50 -07:00
Seth House
988f238650 Merge pull request #10846 from gravyboat/best_practices 
New document regarding best practices for Salt.
 2014-02-27 20:27:11 -07:00
Seth House
86e0075fcf Updated tutorials, highstate, and PyDSL docs from term links to ref 2014-02-27 19:43:12 -07:00
Seth House
373caf5b2e Added ref anchor for syndic docs 2014-02-27 19:38:57 -07:00
Seth House
46c1f24f8a Added ref anchor for highstate docs 2014-02-27 19:38:57 -07:00
Seth House
adaec101aa Added ref anchor for salt-cloud docs 2014-02-27 19:38:57 -07:00
Seth House
12481b9e38 Added ref anchor for renderer docs 2014-02-27 19:38:57 -07:00
Seth House
21d4092c77 Added ref anchor for overstate docs 2014-02-27 19:38:57 -07:00
Seth House
d9d8e2c2b4 Added ref anchor for peer docs 2014-02-27 19:38:57 -07:00
Seth House
fdfda7869e Added ref anchors to state layers doc 2014-02-27 19:38:57 -07:00
Seth House
d4a71b2bc0 Added ref anchor for file server docs 2014-02-27 19:38:57 -07:00
Seth House
c29f9205ad Added ref anchors for the top file and environments 2014-02-27 19:38:57 -07:00
Seth House
c9f2830637 Added ref anchors for the various targeting types 2014-02-27 19:38:57 -07:00
Seth House
276d05b464 Added ref anchors for the ordering sections 2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Seth House
9a95c6d7c3 Added links to each glossary entry; wrapped in glossary directive 2014-02-27 19:38:56 -07:00
Daniel Wallace
7e3d6ce505 [salt.cloud] key_filename is not always set for expanduser 
[ERROR   ] There was a query error: 'NoneType' object has no attribute 'startswith'
Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/salt/cloud/cli.py", line 381, in run
    ret = mapper.run_map(dmap)
  File "/usr/lib/python2.7/site-packages/salt/cloud/__init__.py", line 1692, in run_map
    profile, local_master=local_master
  File "/usr/lib/python2.7/site-packages/salt/cloud/__init__.py", line 905, in create
    output = self.clouds[func](vm_)
  File "/usr/lib/python2.7/site-packages/salt/cloud/clouds/openstack.py", line 329, in create
    key_filename = os.path.expanduser(key_filename)
  File "/usr/lib64/python2.7/posixpath.py", line 261, in expanduser
    if not path.startswith('~'):
AttributeError: 'NoneType' object has no attribute 'startswith'
 2014-02-27 19:33:35 -06:00
rallytime
00b8c3dc70 Started writing brew unit tests 2014-02-27 17:03:08 -07:00
Forrest Alvarez
f8f98a383d Fixed a few line length issues. 2014-02-27 23:57:16 +00:00
Forrest Alvarez
1b778176fc Merge remote branch 'upstream/develop' into develop 2014-02-27 23:41:52 +00:00
Thomas S Hatch
b18e89fdc3 clean up whitespace 2014-02-27 15:47:47 -07:00
Thomas S Hatch
f1e8011e6f Merge pull request #10841 from cachedout/#10812 
Allow state concurrency
 2014-02-27 15:46:31 -07:00
Thomas S Hatch
3da1b0e07a Merge pull request #10843 from cachedout/gravyboat 
Update AUTHORS
 2014-02-27 15:44:18 -07:00
Thomas S Hatch
9658aaa27b Clean up pillar walkthrough 2014-02-27 15:43:24 -07:00
Mike Place
c80807c3bb Add Nicole to AUTHORS 2014-02-27 15:42:31 -07:00
Mike Place
10b5bf4cf3 Add @gravyboat to AUTHORS. 2014-02-27 15:41:24 -07:00
Thomas S Hatch
8a3de9154c Merge pull request #10692 from stevage/pillar-tutorial 
Improvements to the Pillar Walkthrough as per #10467
 2014-02-27 15:30:24 -07:00
Thomas S Hatch
52d3e6d83f Merge pull request #10839 from borgstrom/pyobjects_ids 
Pyobjects ids
 2014-02-27 15:29:06 -07:00
Thomas S Hatch
0385a8bc28 Merge pull request #10828 from ticosax/mogrify-extension-name 
Mogrify name of extensions
 2014-02-27 15:28:37 -07:00
Mike Place
86d1cbe652 Allow state concurrency 2014-02-27 15:02:19 -07:00
Mike Place
6a318faee3 Merge pull request #10836 from rallytime/mac_group_test 
Wrote the rest of the mac_group unit tests
 2014-02-27 14:13:58 -07:00
Evan Borgstrom
aedb4a3a74 Oops. 977d9ef was wrong. The indent was right the first time. Undoing. 2014-02-27 16:08:43 -05:00
Evan Borgstrom
977d9ef651 Fix incorrect indent on else statement 2014-02-27 16:07:53 -05:00
Evan Borgstrom
cc8e25e316 Rebuild StateRegistry storage so IDs across modules work 
As it stands the following will fail as we didn't allow duplicate IDs
under any circumstances:

    with Pkg.installed("nginx"):
    	Service.running("nginx")

This commit changes the way the StateRegistry stores states to allow the
above example to work properly.

Now it behaves much more closely to the YAML + Jinja renderer.
 2014-02-27 15:52:14 -05:00
Samuel Smith
d4775819f7 Merge pull request #10837 from SmithSamuelM/sam_raet_12 
Sam raet 12 Added persitence classes for Raet in keeping.py
 2014-02-27 13:07:30 -07:00
Samuel M Smith
31ef442ae0 Merge remote-tracking branch 'upstream/develop' into sam_raet_12 2014-02-27 13:06:19 -07:00