Commits · e444daf21a5fc362f1046571b025c40d5a7d7b3a · nexedi / slapos

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 4 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
- avoid busy loops, use threadsafe Queue · d44ce5f5
  Marco Mariani authored Nov 19, 2012
  
  d44ce5f5
16 Nov, 2012 2 commits
- add option to enable/disable bully · 224c7d98
  Marco Mariani authored Nov 16, 2012
  
  224c7d98
- comments · 44a20bdf
  Marco Mariani authored Nov 16, 2012
  
  44a20bdf
15 Nov, 2012 5 commits
- Fix md5 · fd82a299
  Cédric de Saint Martin authored Nov 15, 2012
  
  fd82a299
- Follow recent changes in SLAP lib: catch more exceptions · ef9dccd4
  Cédric de Saint Martin authored Nov 15, 2012
  
  ef9dccd4
- renamed variables for clarity, string constants, cleanup · 9e118e67
  Marco Mariani authored Nov 15, 2012
  
  9e118e67
- rearrange sections, minimize diffs, comments · 1daa1179
  Marco Mariani authored Nov 15, 2012
  
  1daa1179
- rearrange sections, minimize diffs · fa45dff4
  Marco Mariani authored Nov 15, 2012
  
  fa45dff4
14 Nov, 2012 2 commits
- maarch-configuration recipe · bb6937d4
  Marco Mariani authored Nov 14, 2012
  
  bb6937d4
- made lapp stack independent from maarch; comments · e712c04f
  Marco Mariani authored Nov 14, 2012
  
  e712c04f
13 Nov, 2012 1 commit
- Merge remote-tracking branch 'origin/lapp' into lapp · 3d0141f7
  Marco Mariani authored Nov 13, 2012
  
  3d0141f7