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
33,634 Commits 24 Branches 182 Tags 341 MiB
5ed95d261e
Commit Graph

178 Commits

Author SHA1 Message Date
Thomas S Hatch
a5c8ae09a3 Clean up mess from bad merge 2014-06-30 15:14:14 -06:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
vs
cfa163d4fb Merge remote-tracking branch 'upstream/develop' into sign_master_keys 2014-06-27 03:52:30 -07:00
Jesse Collier
5f67e13465 Fixing bug that prevents correct status with upstart 2014-06-25 12:47:22 -07:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
a62432ad18 Removed debian rules file; will conflict 2014-06-18 20:56:56 -06:00
Bret Palsson
5f8f3d3f28 Require python-requests for install 2014-04-08 07:40:08 +00:00
Bret Palsson
1134d34a2d Support change from urllib2 to requests lib. 
Commit f809f91 changed the fileclient from urllib2 to requests. To properly build a .deb package we need to add python-requests to the build dependencies.
 2014-04-07 23:11:14 -07:00
Bret Palsson
38d5a5cb85
Add salt-cloud to debian packaging 2014-03-21 04:59:50 +00:00
gustavo panizzo
e8aaa86972 run after cloud-init if it's installed 2014-02-20 12:56:14 -03:00
Seth House
5779036e67 Fix bad commit introducing the WebHooks URL 
This partially reverts commit a5dcdad8a4
by removing the extra files that were committed by mistake.

Conflicts:
	saltapi/netapi/rest_cherrypy/app.py
 2014-02-11 14:24:08 -07:00
Seth House
a5dcdad8a4 Add a new URL entry point for use with generic web hooks 
This allows external services or custom scripts to send notifications
through Salt.
 2014-01-30 11:56:25 -07:00
Seth House
f5e5ce5846 Added 0.8.3 to Debian changelog 2013-12-02 10:02:24 -08:00
Corey Quinn
9e402e6280 Updating packaging files for salt-ssh and upstart/logrotate 2013-11-16 17:09:23 -08:00
Joe Healy
ddf0d72ecd Updated for new release 
Note: this change will primarily have an effect on daily launchpad builds and
then builds for the ubuntu ppa.
 2013-10-07 20:49:34 +11:00
Seth House
479357882f Added 0.8.2 to the debian changelog 2013-07-18 14:05:29 -06:00
Corey Quinn
412817c78b Added myself as the maintainer for now. 2013-07-01 12:29:39 -07:00
Corey Quinn
5e1f4ceda5 Update changelog for 0.16.0 release 2013-07-01 08:40:25 -07:00
Corey Quinn
9b6fa252da Updated debian changelog to reflect 0.15.3 2013-06-01 16:36:44 -07:00
Corey Quinn
06e7559c6d Bump version in debian changelog 2013-05-31 15:25:47 -07:00
Seth House
effd8e08c8 Bumped changelog for the 0.8.1 release 2013-05-21 20:28:46 -06:00
Kirill Timofeev
c59a1fb9bf /usr/bin/env python -> /usr/bin/python in scripts 2013-05-17 11:44:35 -07:00
Corey Quinn
421636ac8e dctrl-tools belongs in depends, not build-depends 2013-05-16 11:14:27 -07:00
Corey Quinn
2d9322a8d9 Added dctrl-tools to debian packaging 2013-05-15 16:47:51 -07:00
Corey Quinn
f765b9604e Update debian changelog for 15.1 2013-05-09 11:09:09 -07:00
Corey Quinn
5f785de8c9 Version 0.15.0 added to debian changelog 2013-05-06 05:58:58 -07:00
Will Platnick
fff99df1bb Up'd version to 0.14.1 2013-04-17 19:43:06 -05:00
Sean Channel
5b3fb32755 recommend CherryPy3 instead of require 2013-04-10 11:58:32 -07:00
Sean Channel
72b738b23d version bump 2013-04-10 08:42:41 -07:00
Sean Channel
e074f61985 add upstart 2013-04-10 08:42:26 -07:00
Sean Channel
9d587af806 require cherrypy and saltmaster 2013-04-10 08:41:50 -07:00
Isaac Freeman
247a8c183d fix debian/control to use python2.6 2013-04-04 16:35:16 -04:00
Sean Channel
7dc98c7152 make manpages on package build 2013-03-27 17:18:29 -07:00
Sean Channel
a4ab674e55 correct description 2013-03-24 11:23:23 -07:00
Sean Channel
675c9db918 naught-dot-fourteen bump 2013-03-22 20:11:57 -07:00
Sean Channel
5affcba400 point release 0.13.3 2013-03-18 16:21:43 -07:00
Sean Channel
3bc8c187da 0.13.2 package update 2013-03-12 14:27:42 -07:00
Sean Channel
acacd8d0e2 revert version bump. there is no 13.2 2013-03-09 14:05:53 -08:00
Bruno Clermont
cb94ca570d only the minion use debconf-get-selections 2013-03-08 13:26:54 +08:00
Sean Channel
e592c30d6f version bump for pending release 2013-03-01 13:28:02 -08:00
Sean Channel
60c6c36c73 Recommend debconf-utils and do it in salt-common. fixes #3834 2013-02-26 10:07:53 -08:00
Sean Channel
5817f888a1 update the package per issue #3710 and issue #3821 2013-02-23 14:37:31 -08:00
Sean Channel
632f6690a8 Pre-Depend on salt-common to fix #3710 2013-02-23 12:26:11 -08:00
Sean Channel
839bf1528f more for issue #3710 2013-02-22 02:14:54 -08:00
Sean Channel
3339010909 not perfect but better. for issue #3710 2013-02-22 02:09:15 -08:00
Thomas S Hatch
ba91987a94 Merge pull request #3765 from ydavid365/2013 
2013
 2013-02-18 09:07:43 -08:00
John Albietz
836002f70e 2012-2013 2013-02-18 00:18:09 -08:00
ydavid365
7ae61e378e 2013 2013-02-17 21:14:38 -08:00
Sean Channel
9e862a4115 bump version 2013-02-16 12:03:17 -08:00