Commits · 260b0069ab2680c96cf8ebd026a2d8f0b243b002 · Thomas Gambier / slapos

28 Nov, 2012 2 commits
- connect to postgres through stunnel · 260b0069
  Marco Mariani authored Nov 28, 2012
  
  260b0069
- bin/takeover script · 75f83ced
  Marco Mariani authored Nov 28, 2012
  
  75f83ced
27 Nov, 2012 3 commits
- stop an instance when freezing it · f8124124
  Marco Mariani authored Nov 27, 2012
  
  f8124124
- call dropbear with -y · 1bf9c78b
  Marco Mariani authored Nov 27, 2012
  
  1bf9c78b
- renamed dump file · 53852e23
  Marco Mariani authored Nov 27, 2012
  
  53852e23
26 Nov, 2012 6 commits
- Merge remote-tracking branch 'origin/master' into lapp-resilient2 · c23bb65f
  Marco Mariani authored Nov 26, 2012
  
  c23bb65f
- use += to include rdiff-backup etc. · 8f1af741
  Marco Mariani authored Nov 26, 2012
  
  8f1af741
- backup postgres with custom format and no permission · 97e89b28
  Marco Mariani authored Nov 26, 2012
  
  97e89b28
- updated md5 · 19a2b07e
  Marco Mariani authored Nov 26, 2012
  
  19a2b07e
- fixed backup path · d406137a
  Marco Mariani authored Nov 26, 2012
  
  d406137a
- removed reference to unused section · 9ebe821e
  Marco Mariani authored Nov 26, 2012
  
  9ebe821e
23 Nov, 2012 5 commits
- replaced slapos.cookbook:maarch.configuration with own egg · e444daf2
  Marco Mariani authored Nov 23, 2012
  
  e444daf2
- removed dead reference to lamp.request · 18f04c54
  Marco Mariani authored Nov 23, 2012
  
  18f04c54
- publish ip parameter · 75e0523d
  Marco Mariani authored Nov 23, 2012
  
  75e0523d
- publishurl -> publish · 8e8ea36f
  Marco Mariani authored Nov 23, 2012
  
  8e8ea36f
- avoid using instance.getComputerId() which does not exist. · 5d573214
  Marco Mariani authored Nov 23, 2012
  
  5d573214
22 Nov, 2012 2 commits
- Merge remote-tracking branch 'origin/resiliency_annotated' into lapp-resilient2 · 69b1df32
  Marco Mariani authored Nov 22, 2012
  
  69b1df32
- some comments on wrappers · 9ef171f8
  Marco Mariani authored Nov 22, 2012
  
  9ef171f8
21 Nov, 2012 7 commits
- revert 9459b996 · 944d97c2
  Marco Mariani authored Nov 21, 2012
  
  944d97c2
- Merge remote-tracking branch 'origin/lapp-resilient2' into lapp-resilient2 · af58eabd
  Marco Mariani authored Nov 21, 2012
  
  af58eabd
- tempalte -> instance rename · 36ab5dde
  Marco Mariani authored Nov 21, 2012
  
  36ab5dde
- template -> instance rename · 9459b996
  Marco Mariani authored Nov 21, 2012
  
  9459b996
- Merge branch 'resiliency_annotated' into lapp-resilient2 · 9326f333
  Marco Mariani authored Nov 21, 2012
  
  9326f333
- Merge remote-tracking branch 'origin/resiliency_annotated' into resiliency_annotated · 719fb736
  Marco Mariani authored Nov 21, 2012
```
Conflicts:
	stack/lamp/buildout.cfg
```
  719fb736
- template -> instance rename · c8f56233
  Marco Mariani authored Nov 21, 2012
  
  c8f56233
20 Nov, 2012 12 commits
- fixed misnamed file · a3dc530a
  Marco Mariani authored Nov 20, 2012
  
  a3dc530a
- manual port of changes on lapp-resilient over this new branch · 93d599bc
  Marco Mariani authored Nov 20, 2012
  
  93d599bc
- Merge branch 'lapp' into lapp-resilient2 · d6a9aaa4
  Marco Mariani authored Nov 20, 2012
  
  d6a9aaa4
- Merge remote-tracking branch 'origin/lapp' into lapp · 0f3b4c86
  Marco Mariani authored Nov 20, 2012
  
  0f3b4c86
- Merge branch 'resiliency_annotated' into lapp · 6675b205
  Marco Mariani authored Nov 20, 2012
```
Conflicts:
	slapos/recipe/request.py
```
  6675b205
- Merge branch 'lapp' into lapp-resilient2 · 1de09c67
  Marco Mariani authored Nov 20, 2012
  
  1de09c67
- check that bin:initdb exists · cac4208e
  Marco Mariani authored Nov 20, 2012
  
  cac4208e
- Merge branch 'lapp' into lapp-resilient2 · e53a371d
  Marco Mariani authored Nov 20, 2012
  
  e53a371d
- template -> instance · e8bd7a7d
  Marco Mariani authored Nov 20, 2012
  
  e8bd7a7d
- root instance for default software_type · 43836db7
  Marco Mariani authored Nov 20, 2012
  
  43836db7
- Merge remote-tracking branch 'origin/lapp' into lapp · c6489887
  Marco Mariani authored Nov 20, 2012
  
  c6489887
- renamed template -> instance, etc. · 16d6b022
  Marco Mariani authored Nov 20, 2012
  
  16d6b022
19 Nov, 2012 3 commits
- moved sections, comments · 73031170
  Marco Mariani authored Nov 19, 2012
  
  73031170
- comments to align inter-branch diffs · c637561a
  Marco Mariani authored Nov 19, 2012
  
  c637561a
- new renaming logic · 7b2441f4
  Marco Mariani authored Nov 19, 2012
  
  7b2441f4