Commits · cbb07be44e38e70ab7a2749d9b60b034ab8ab376 · Eteri / slapos

30 Oct, 2012 7 commits
- Merge branch 'drupal2' · cbb07be4
  Cédric de Saint Martin authored Oct 30, 2012
```
Conflicts:
	software/drupal/software.cfg
```
  cbb07be4
- Revert "Experimental way to customize LAMP stack" · 5e792b10
  Cédric de Saint Martin authored Oct 30, 2012
```
This reverts commit daeeae60.
```
  5e792b10
- LAMP: Update egg versions · b830b641
  Cédric de Saint Martin authored Oct 30, 2012
  
  b830b641
- Advertise development of new version · 226b6ed0
  Cédric de Saint Martin authored Oct 30, 2012
  
  226b6ed0
- Release slapos.cookbook-0.69 · 7a7f8970
  Cédric de Saint Martin authored Oct 30, 2012
  
  7a7f8970
- Experimental way to customize LAMP stack · daeeae60
  Cédric de Saint Martin authored Oct 25, 2012
  
  daeeae60
- drupal version bump (security) · 7a7fdff6
  Marco Mariani authored Oct 25, 2012
  
  7a7fdff6
29 Oct, 2012 1 commit
- Skip database configuration during initial setup. · 47dedac9
  Marco Mariani authored Oct 29, 2012
  
  47dedac9
25 Oct, 2012 1 commit
- Add explicitly egg dependencies because of buildout bug · 3f3e11f1
  Cédric de Saint Martin authored Oct 25, 2012
  
  3f3e11f1
24 Oct, 2012 4 commits
- updated CHANGES.txt · 1e45f2dd
  Marco Mariani authored Oct 24, 2012
  
  1e45f2dd
- backslash is unsafe as well (especially at the end of the key) · c98cc19a
  Marco Mariani authored Oct 24, 2012
  
  c98cc19a
- substitute process in execution · bca4d4e3
  Marco Mariani authored Oct 24, 2012
  
  bca4d4e3
- createWrapper() · 73baf7a1
  Marco Mariani authored Oct 24, 2012
  
  73baf7a1
23 Oct, 2012 1 commit
- replaced mirror with working url · ea9f28cc
  Marco Mariani authored Oct 23, 2012
  
  ea9f28cc
22 Oct, 2012 1 commit
- url was not working. get working url · 4f6c4de2
  Mame Coumba Sall authored Oct 22, 2012
  
  4f6c4de2
20 Oct, 2012 1 commit
- url is not working, old url is working now · 739a1427
  Mame Coumba Sall authored Oct 20, 2012
  
  739a1427
19 Oct, 2012 2 commits
- fixed Łukasz · 865c6ea8
  Marco Mariani authored Oct 19, 2012
  
  865c6ea8
- Be more precise about amount of RAM we can have in KVM · 0f85003a
  Cédric de Saint Martin authored Oct 19, 2012
  
  0f85003a
18 Oct, 2012 4 commits
- added missing import · 18305acf
  Marco Mariani authored Oct 18, 2012
  
  18305acf
- Merge branch 'kvm' · 3806c6ff
  Cédric de Saint Martin authored Oct 18, 2012
  
  3806c6ff
- Add schemas used to validate input/output parameters of a KVM instance. · 4e5626f8
  Cédric de Saint Martin authored Oct 17, 2012
  
  4e5626f8
- Update connection parameters to convention: xx-xx. · 72a524af
  Cédric de Saint Martin authored Oct 17, 2012
  
  72a524af
17 Oct, 2012 3 commits
- Switch to more logical naming of instance*.cfg.in files · 3be7b11d
  Cédric de Saint Martin authored Oct 17, 2012
  
  3be7b11d
- Allow to give RMA and disk parameters to KVM instance. · 0466a30c
  Cédric de Saint Martin authored Oct 17, 2012
  
  0466a30c
- typo 0ff -> Off · 41145f32
  Marco Mariani authored Sep 21, 2012
  
  41145f32
16 Oct, 2012 3 commits
- python interpreter with slapos eggs · caeda529
  Marco Mariani authored Oct 16, 2012
  
  caeda529
- updated stunnel to 4.54 (http://www.mail-archive.com/openssl-users@openssl.org/msg68861.html ) · 4158ad94
  Marco Mariani authored Oct 16, 2012
  
  4158ad94
- update lxml to 3.0.1 · 64f59b64
  Marco Mariani authored Oct 16, 2012
  
  64f59b64
15 Oct, 2012 9 commits
- Remove what seem to be unused dependency. · aea82417
  Cédric de Saint Martin authored Oct 15, 2012
```
Will it blend?
```
  aea82417
- pass executable by named parameter, handle multiple notification urls · ec95ab3b
  Marco Mariani authored Oct 15, 2012
  
  ec95ab3b
- fixup! Update noVNC · 9bdb2611
  Cédric de Saint Martin authored Oct 15, 2012
  
  9bdb2611
- Update noVNC · 00e5c105
  Cédric de Saint Martin authored Oct 15, 2012
  
  00e5c105
- KVM: pin versions · 4ff5bb29
  Cédric de Saint Martin authored Oct 15, 2012
  
  4ff5bb29
- Use newer 'service' path. · f1dc2bd9
  Cédric de Saint Martin authored Oct 15, 2012
```
Requires slapos.core 0.32.2
```
  f1dc2bd9
- Quick cleanup of KVM · e9aaddc1
  Cédric de Saint Martin authored Oct 15, 2012
  
  e9aaddc1
- fixup! Support (for simplicity) both - and _ syntaxes. · 63ba10a7
  Cédric de Saint Martin authored Oct 15, 2012
  
  63ba10a7
- Support (for simplicity) both - and _ syntaxes. · b2390627
  Cédric de Saint Martin authored Oct 15, 2012
```
When softwaretype & slapgrid are stabilized, use only -.
```
  b2390627
11 Oct, 2012 2 commits
- Remove dead software release · 800d3332
  Cédric de Saint Martin authored Oct 11, 2012
  
  800d3332
- Update slapos component · 6eca4b6a
  Cédric de Saint Martin authored Oct 11, 2012
  
  6eca4b6a
05 Oct, 2012 1 commit

Antoine Catton authored Aug 24, 2012

This recipe was colliding with slapos.recipe.template
recipe.

Moreover, this is useless since slapos.recipe.template provide
the same functionality.
(cherry picked from commit 4195f78b because of ugly merge.)

Conflicts:
	setup.py

5f09e283